Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ATL][MSPAINT] Add ATLTRACE and fix assertion failures (#4299)
by Katayama Hirofumi MZ 22 Jan '22

22 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7014cf04b1a03540457cd… commit 7014cf04b1a03540457cd61678cd517b523eee7f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 23 00:59:12 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 23 00:59:12 2022 +0900 [ATL][MSPAINT] Add ATLTRACE and fix assertion failures (#4299) - Implement ATLTRACE and AtlTrace in atlbase.h. - Fix assertion failures in mspaint. CORE-17969, CORE-18012 --- base/applications/mspaint/history.cpp | 14 +- base/applications/mspaint/imgarea.cpp | 10 +- base/applications/mspaint/mouse.cpp | 2 +- base/applications/mspaint/palettemodel.cpp | 9 +- base/applications/mspaint/precomp.h | 9 + base/applications/mspaint/scrollbox.cpp | 14 +- base/applications/mspaint/selection.cpp | 2 +- base/applications/mspaint/textedit.cpp | 8 +- base/applications/mspaint/toolsmodel.cpp | 11 +- base/applications/mspaint/winproc.cpp | 62 +++--- sdk/lib/atl/atlbase.h | 2 +- sdk/lib/atl/atltrace.h | 293 +++++++++++++++++++++++++++++ 12 files changed, 380 insertions(+), 56 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 1a5cd8966a8..7aa36fab4dc 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -14,12 +14,14 @@ void ImageModel::NotifyDimensionsChanged() { - imageArea.SendMessage(WM_IMAGEMODELDIMENSIONSCHANGED); + if (imageArea.IsWindow()) + imageArea.SendMessage(WM_IMAGEMODELDIMENSIONSCHANGED); } void ImageModel::NotifyImageChanged() { - imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED); + if (imageArea.IsWindow()) + imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED); } ImageModel::ImageModel() @@ -44,7 +46,7 @@ ImageModel::ImageModel() void ImageModel::CopyPrevious() { - DPRINT("%s: %d\n", __FUNCTION__, currInd); + ATLTRACE("%s: %d\n", __FUNCTION__, currInd); DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); hBms[(currInd + 1) % HISTORYSIZE] = CopyDIBImage(hBms[currInd]); currInd = (currInd + 1) % HISTORYSIZE; @@ -57,7 +59,7 @@ void ImageModel::CopyPrevious() void ImageModel::Undo() { - DPRINT("%s: %d\n", __FUNCTION__, undoSteps); + ATLTRACE("%s: %d\n", __FUNCTION__, undoSteps); if (undoSteps > 0) { int oldWidth = GetWidth(); @@ -76,7 +78,7 @@ void ImageModel::Undo() void ImageModel::Redo() { - DPRINT("%s: %d\n", __FUNCTION__, redoSteps); + ATLTRACE("%s: %d\n", __FUNCTION__, redoSteps); if (redoSteps > 0) { int oldWidth = GetWidth(); @@ -95,7 +97,7 @@ void ImageModel::Redo() void ImageModel::ResetToPrevious() { - DPRINT("%s: %d\n", __FUNCTION__, currInd); + ATLTRACE("%s: %d\n", __FUNCTION__, currInd); DeleteObject(hBms[currInd]); hBms[currInd] = CopyDIBImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE]); SelectObject(hDrawingDC, hBms[currInd]); diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index cfa9a84d8d3..0cb2f8de2ab 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -68,6 +68,8 @@ void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY) LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (!IsWindow() || !sizeboxLeftTop.IsWindow()) + return 0; int imgXRes = imageModel.GetWidth(); int imgYRes = imageModel.GetHeight(); sizeboxLeftTop.MoveWindow( @@ -105,7 +107,7 @@ LRESULT CImgAreaWindow::OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BO HDC hdc = (HDC)wParam; if (toolsModel.GetActiveTool() == TOOL_TEXT && !toolsModel.IsBackgroundTransparent() && - textEditWindow.IsWindowVisible()) + ::IsWindowVisible(textEditWindow)) { // Do clipping HWND hChild = textEditWindow; @@ -143,11 +145,11 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b DeleteObject(SelectObject(hdc, oldPen)); } EndPaint(&ps); - if (selectionWindow.IsWindowVisible()) + if (selectionWindow.IsWindow()) selectionWindow.Invalidate(FALSE); - if (miniature.IsWindowVisible()) + if (miniature.IsWindow()) miniature.Invalidate(FALSE); - if (textEditWindow.IsWindowVisible()) + if (textEditWindow.IsWindow()) textEditWindow.Invalidate(FALSE); return 0; } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 16a6500e9d1..b442d0c9daf 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -394,7 +394,7 @@ struct TextTool : ToolBase { imageModel.ResetToPrevious(); - BOOL bTextBoxShown = textEditWindow.IsWindowVisible(); + BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow); if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0) { CString szText; diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index 1f5dd899be6..c91899bd982 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -95,13 +95,16 @@ void PaletteModel::SetBgColor(COLORREF newColor) void PaletteModel::NotifyColorChanged() { - paletteWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); - selectionWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); + if (paletteWindow.IsWindow()) + paletteWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); + if (selectionWindow.IsWindow()) + selectionWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); if (textEditWindow.IsWindow()) textEditWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); } void PaletteModel::NotifyPaletteChanged() { - paletteWindow.SendMessage(WM_PALETTEMODELPALETTECHANGED); + if (paletteWindow.IsWindow()) + paletteWindow.SendMessage(WM_PALETTEMODELPALETTECHANGED); } diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 1f27501432f..df5b929bd82 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -1,6 +1,15 @@ #ifndef _MSPAINT_H #define _MSPAINT_H +#ifdef NDEBUG + #undef DBG + #undef _DEBUG +#endif + +#if DBG && !defined(_DEBUG) + #define _DEBUG +#endif + #include <stdarg.h> #include <windef.h> diff --git a/base/applications/mspaint/scrollbox.cpp b/base/applications/mspaint/scrollbox.cpp index d2be15f8f18..c05dffd5ec9 100644 --- a/base/applications/mspaint/scrollbox.cpp +++ b/base/applications/mspaint/scrollbox.cpp @@ -61,7 +61,8 @@ UpdateScrollbox() scrollboxWindow.GetWindowRect(&tempRect); sizeScrollBox = CSize(tempRect.Width(), tempRect.Height()); - imageArea.GetClientRect(&tempRect); + if (imageArea.IsWindow()) + imageArea.GetClientRect(&tempRect); sizeImageArea = CSize(tempRect.Width(), tempRect.Height()); sizeImageArea += CSize(GRIP_SIZE * 2, GRIP_SIZE * 2); @@ -87,14 +88,17 @@ UpdateScrollbox() si.nPage = sizeScrollBox.cy; scrollboxWindow.SetScrollInfo(SB_VERT, &si); - scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), - -scrollboxWindow.GetScrollPos(SB_VERT), - sizeImageArea.cx, sizeImageArea.cy, TRUE); + if (scrlClientWindow.IsWindow()) + { + scrlClientWindow.MoveWindow( + -scrollboxWindow.GetScrollPos(SB_HORZ), -scrollboxWindow.GetScrollPos(SB_VERT), + sizeImageArea.cx, sizeImageArea.cy, TRUE); + } } LRESULT CScrollboxWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_hWnd == scrollboxWindow.m_hWnd) + if (m_hWnd && m_hWnd == scrollboxWindow.m_hWnd) { UpdateScrollbox(); } diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index c2c32880f97..74083505bc2 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -57,7 +57,7 @@ ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, void ForceRefreshSelectionContents() { - if (selectionWindow.IsWindowVisible()) + if (::IsWindowVisible(selectionWindow)) { selectionWindow.SendMessage(WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); selectionWindow.SendMessage(WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 792633a55e7..80f87682e32 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -300,12 +300,12 @@ HWND CTextEditWindow::Create(HWND hwndParent) const DWORD style = ES_LEFT | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_CHILD | WS_THICKFRAME; - m_hWnd = ::CreateWindowEx(0, WC_EDIT, NULL, style, 0, 0, 0, 0, - hwndParent, NULL, hProgInstance, NULL); - if (m_hWnd) + HWND hwnd = ::CreateWindowEx(0, WC_EDIT, NULL, style, 0, 0, 0, 0, + hwndParent, NULL, hProgInstance, NULL); + if (hwnd) { #undef SubclassWindow // Don't use this macro - SubclassWindow(m_hWnd); + SubclassWindow(hwnd); UpdateFont(); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 021df46d336..8811cf087ff 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -159,13 +159,14 @@ void ToolsModel::SetZoom(int nZoom) void ToolsModel::NotifyToolChanged() { - toolBoxContainer.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); - toolSettingsWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); - + if (toolBoxContainer.IsWindow()) + toolBoxContainer.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); + if (toolSettingsWindow.IsWindow()) + toolSettingsWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); if (fontsDialog.IsWindow()) fontsDialog.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); - - textEditWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); + if (textEditWindow.IsWindow()) + textEditWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); } void ToolsModel::NotifyToolSettingsChanged() diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index a0af103f080..9105d85115e 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -51,7 +51,7 @@ void CMainWindow::alignChildrenToMainWindow() RECT clientRect; GetClientRect(&clientRect); - if (toolBoxContainer.IsWindowVisible()) + if (::IsWindowVisible(toolBoxContainer)) { x = 56; w = clientRect.right - 56; @@ -61,7 +61,7 @@ void CMainWindow::alignChildrenToMainWindow() x = 0; w = clientRect.right; } - if (paletteWindow.IsWindowVisible()) + if (::IsWindowVisible(paletteWindow)) { y = 49; h = clientRect.bottom - 49; @@ -73,13 +73,18 @@ void CMainWindow::alignChildrenToMainWindow() } RECT statusBarRect0; - SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0); int statusBarBorders[3]; - SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); + if (::IsWindow(hStatusBar)) + { + ::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0); + ::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); + } int statusBarHeight = statusBarRect0.bottom - statusBarRect0.top + statusBarBorders[1]; - scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); - paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); + if (scrollboxWindow.IsWindow()) + scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); + if (paletteWindow.IsWindow()) + paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); } void CMainWindow::saveImage(BOOL overwrite) @@ -268,7 +273,9 @@ LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HMENU menu = GetMenu(); - BOOL trueSelection = (selectionWindow.IsWindowVisible() && ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); + BOOL trueSelection = + (::IsWindowVisible(selectionWindow) && + ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); switch (lParam) { case 0: /* File menu */ @@ -320,17 +327,17 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO CloseClipboard(); break; case 2: /* View menu */ - CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(toolBoxContainer.IsWindowVisible())); - CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(paletteWindow.IsWindowVisible())); - CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(hStatusBar))); - CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(fontsDialog.IsWindowVisible())); - EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); + CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(::IsWindowVisible(toolBoxContainer))); + CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(::IsWindowVisible(paletteWindow))); + CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(hStatusBar))); + CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(::IsWindowVisible(fontsDialog))); + EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); - CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); - CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); + CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); + CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); break; case 3: /* Image menu */ - EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(selectionWindow.IsWindowVisible())); + EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(::IsWindowVisible(selectionWindow))); CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent())); break; } @@ -351,8 +358,11 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CMainWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; - SendMessage(hStatusBar, WM_SIZE, wParam, lParam); - SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); + if (::IsWindow(hStatusBar)) + { + ::SendMessage(hStatusBar, WM_SIZE, wParam, lParam); + ::SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); + } alignChildrenToMainWindow(); Invalidate(TRUE); return 0; @@ -519,13 +529,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } case IDM_EDITUNDO: - if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) + if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) break; imageModel.Undo(); imageArea.Invalidate(FALSE); break; case IDM_EDITREDO: - if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) + if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) break; imageModel.Redo(); imageArea.Invalidate(FALSE); @@ -558,7 +568,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH } case IDM_EDITSELECTALL: { - if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) + if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) { textEditWindow.SendMessage(EM_SETSEL, 0, -1); break; @@ -608,13 +618,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ - if (selectionWindow.IsWindowVisible()) + if (::IsWindowVisible(selectionWindow)) selectionModel.FlipHorizontally(); else imageModel.FlipHorizontally(); break; case 2: /* flip vertically */ - if (selectionWindow.IsWindowVisible()) + if (::IsWindowVisible(selectionWindow)) selectionModel.FlipVertically(); else imageModel.FlipVertically(); @@ -622,7 +632,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case 3: /* rotate 90 degrees */ break; case 4: /* rotate 180 degrees */ - if (selectionWindow.IsWindowVisible()) + if (::IsWindowVisible(selectionWindow)) selectionModel.RotateNTimes90Degrees(2); else imageModel.RotateNTimes90Degrees(2); @@ -656,11 +666,11 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_VIEWTOOLBOX: - toolBoxContainer.ShowWindow(toolBoxContainer.IsWindowVisible() ? SW_HIDE : SW_SHOW); + toolBoxContainer.ShowWindow(::IsWindowVisible(toolBoxContainer) ? SW_HIDE : SW_SHOW); alignChildrenToMainWindow(); break; case IDM_VIEWCOLORPALETTE: - paletteWindow.ShowWindow(paletteWindow.IsWindowVisible() ? SW_HIDE : SW_SHOW); + paletteWindow.ShowWindow(::IsWindowVisible(paletteWindow) ? SW_HIDE : SW_SHOW); alignChildrenToMainWindow(); break; case IDM_VIEWSTATUSBAR: @@ -674,7 +684,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { fontsDialog.Create(mainWindow); } - registrySettings.ShowTextTool = !fontsDialog.IsWindowVisible(); + registrySettings.ShowTextTool = !::IsWindowVisible(fontsDialog); fontsDialog.ShowWindow(registrySettings.ShowTextTool ? SW_SHOW : SW_HIDE); fontsDialog.SendMessage(DM_REPOSITION, 0, 0); } diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index 502d7b1ad44..a9408bb01a4 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -26,6 +26,7 @@ #include "atlcomcli.h" #include "atlalloc.h" #include "atlexcept.h" +#include "atltrace.h" #include "comcat.h" #include "tchar.h" @@ -1856,7 +1857,6 @@ inline HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) return S_OK; } - }; // namespace ATL #ifndef _ATL_NO_AUTOMATIC_NAMESPACE diff --git a/sdk/lib/atl/atltrace.h b/sdk/lib/atl/atltrace.h new file mode 100644 index 00000000000..6230af9f1fc --- /dev/null +++ b/sdk/lib/atl/atltrace.h @@ -0,0 +1,293 @@ +/* + * PROJECT: ReactOS ATL + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Providing ATLTRACE macro + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include "atldef.h" + +#if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505 + +#include <stdio.h> +#include <crtdbg.h> + +extern "C" +{ +// FIXME: Enabling _DEBUG at top level causes assertion failures... CORE-17505 +int __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber, const char *moduleName, const char *format, ...); +int __cdecl _CrtDbgReportW(int reportType, const wchar_t *filename, int linenumber, const wchar_t *moduleName, const wchar_t *format, ...); +} + +namespace ATL +{ + +template <UINT t_category = (1 << 19), UINT t_level = 0> +class CTraceCategoryEx +{ +public: + enum + { + TraceGeneral = (1 << 0), + TraceCom = (1 << 1), + TraceQI = (1 << 2), + TraceRegistrar = (1 << 3), + TraceRefcount = (1 << 4), + TraceWindowing = (1 << 5), + TraceControls = (1 << 6), + TraceHosting = (1 << 7), + TraceDBClient = (1 << 8), + TraceDBProvider = (1 << 9), + TraceSnapin = (1 << 10), + TraceNotImpl = (1 << 11), + TraceAllocation = (1 << 12), + TraceException = (1 << 13), + TraceTime = (1 << 14), + TraceCache = (1 << 15), + TraceStencil = (1 << 16), + TraceString = (1 << 17), + TraceMap = (1 << 18), + TraceUtil = (1 << 19), + TraceSecurity = (1 << 20), + TraceSync = (1 << 21), + TraceISAPI = (1 << 22), + TraceUser = TraceUtil + }; + + CTraceCategoryEx(LPCTSTR name = NULL) : m_name(name) + { + } + + static UINT GetLevel() { return t_level; } + static UINT GetCategory() { return t_category; } + operator UINT() const { return GetCategory(); } + LPCTSTR GetCategoryName() const { return m_name; } + +protected: + LPCTSTR m_name; +}; + +class CTraceCategory : public CTraceCategoryEx<> +{ + CTraceCategory(LPCTSTR name = NULL) : CTraceCategoryEx<>(name) + { + } +}; + +#define DEFINE_TRACE_CATEGORY(name, cat) extern const DECLSPEC_SELECTANY CTraceCategoryEx<cat, 0> name(TEXT(#name)) +DEFINE_TRACE_CATEGORY(atlTraceGeneral, CTraceCategoryEx<>::TraceGeneral); +DEFINE_TRACE_CATEGORY(atlTraceCOM, CTraceCategoryEx<>::TraceCom); +DEFINE_TRACE_CATEGORY(atlTraceQI, CTraceCategoryEx<>::TraceQI); +DEFINE_TRACE_CATEGORY(atlTraceRegistrar, CTraceCategoryEx<>::TraceRegistrar); +DEFINE_TRACE_CATEGORY(atlTraceRefcount, CTraceCategoryEx<>::TraceRefcount); +DEFINE_TRACE_CATEGORY(atlTraceWindowing, CTraceCategoryEx<>::TraceWindowing); +DEFINE_TRACE_CATEGORY(atlTraceControls, CTraceCategoryEx<>::TraceControls); +DEFINE_TRACE_CATEGORY(atlTraceHosting, CTraceCategoryEx<>::TraceHosting); +DEFINE_TRACE_CATEGORY(atlTraceDBClient, CTraceCategoryEx<>::TraceDBClient); +DEFINE_TRACE_CATEGORY(atlTraceDBProvider, CTraceCategoryEx<>::TraceDBProvider); +DEFINE_TRACE_CATEGORY(atlTraceSnapin, CTraceCategoryEx<>::TraceSnapin); +DEFINE_TRACE_CATEGORY(atlTraceNotImpl, CTraceCategoryEx<>::TraceNotImpl); +DEFINE_TRACE_CATEGORY(atlTraceAllocation, CTraceCategoryEx<>::TraceAllocation); +DEFINE_TRACE_CATEGORY(atlTraceException, CTraceCategoryEx<>::TraceException); +DEFINE_TRACE_CATEGORY(atlTraceTime, CTraceCategoryEx<>::TraceTime); +DEFINE_TRACE_CATEGORY(atlTraceCache, CTraceCategoryEx<>::TraceCache); +DEFINE_TRACE_CATEGORY(atlTraceStencil, CTraceCategoryEx<>::TraceStencil); +DEFINE_TRACE_CATEGORY(atlTraceString, CTraceCategoryEx<>::TraceString); +DEFINE_TRACE_CATEGORY(atlTraceMap, CTraceCategoryEx<>::TraceMap); +DEFINE_TRACE_CATEGORY(atlTraceUtil, CTraceCategoryEx<>::TraceUtil); +DEFINE_TRACE_CATEGORY(atlTraceSecurity, CTraceCategoryEx<>::TraceSecurity); +DEFINE_TRACE_CATEGORY(atlTraceSync, CTraceCategoryEx<>::TraceSync); +DEFINE_TRACE_CATEGORY(atlTraceISAPI, CTraceCategoryEx<>::TraceISAPI); +#undef DEFINE_TRACE_CATEGORY + +struct CTraceCategoryEasy +{ + UINT m_category; + UINT m_level; + LPCTSTR m_name; + + template <UINT t_category, UINT t_level> + CTraceCategoryEasy(const CTraceCategoryEx<t_category, t_level>& cat) + { + m_category = t_category; + m_level = t_level; + m_name = cat.GetCategoryName(); + } + + operator UINT() const { return m_category; } + + BOOL IsGeneral() const + { + return lstrcmp(m_name, TEXT("atlTraceGeneral")) == 0; + } +}; + +struct CTrace +{ + enum + { + DefaultTraceLevel = 0, + DisableTracing = 0xFFFFFFFF, + EnableAllCategories = 0xFFFFFFFF + }; + + static UINT GetLevel() { return s_level; } + static UINT GetCategories() { return s_categories; } + static void SetLevel(UINT level) { s_level = level; } + static void SetCategories(UINT categories) { s_categories = categories; } + + static bool IsTracingEnabled(UINT category, UINT level) + { + return (s_level != DisableTracing && s_level >= level && (s_categories & category)); + } + +protected: + static UINT s_categories; + static UINT s_level; +}; + +DECLSPEC_SELECTANY UINT CTrace::s_categories = CTrace::EnableAllCategories; +DECLSPEC_SELECTANY UINT CTrace::s_level = CTrace::DefaultTraceLevel; + +template <typename X_CHAR> +inline VOID __stdcall +AtlTraceV(_In_opt_z_ const X_CHAR * file, + _In_ INT line, + _In_ const CTraceCategoryEasy& cat, + _In_ UINT level, + _In_z_ _Printf_format_string_ PCSTR format, + _In_ va_list va) +{ + char szBuff[1024], szFile[MAX_PATH]; + size_t cch = 0; + const BOOL bUnicode = (sizeof(TCHAR) == 2); + + if (!CTrace::IsTracingEnabled(cat, level)) + return; + +#ifdef _STRSAFE_H_INCLUDED_ + StringCchPrintfA(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? "%ls" : "%hs"), file); + if (!cat.IsGeneral()) + { + StringCchPrintfA(szBuff, _countof(szBuff), (bUnicode ? "%ls - " : "%hs - "), cat.m_name); + StringCchLengthA(szBuff, _countof(szBuff), &cch); + } + StringCchVPrintfA(&szBuff[cch], _countof(szBuff) - cch, format, va); +#else + _snprintf(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? "%ls" : "%hs"), file); + if (!cat.IsGeneral()) + cch = _snprintf(szBuff, _countof(szBuff), (bUnicode ? "%ls - " : "%hs - "), cat.m_name); + _vsnprintf(&szBuff[cch], _countof(szBuff) - cch, format, va); +#endif + + _CrtDbgReport(_CRT_WARN, szFile, line, NULL, "%hs", szBuff); +} + +template <typename X_CHAR> +inline VOID __stdcall +AtlTraceV(_In_opt_z_ const X_CHAR * file, + _In_ INT line, + _In_ const CTraceCategoryEasy& cat, + _In_ UINT level, + _In_z_ _Printf_format_string_ PCWSTR format, + _In_ va_list va) +{ + WCHAR szBuff[1024], szFile[MAX_PATH]; + size_t cch = 0; + const BOOL bUnicode = (sizeof(TCHAR) == 2); + + if (!CTrace::IsTracingEnabled(cat, level)) + return; + +#ifdef _STRSAFE_H_INCLUDED_ + StringCchPrintfW(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? L"%ls" : L"%hs"), file); + if (!cat.IsGeneral()) + { + StringCchPrintfW(szBuff, _countof(szBuff), (bUnicode ? L"%ls - " : L"%hs - "), cat.m_name); + StringCchLengthW(szBuff, _countof(szBuff), &cch); + } + StringCchVPrintfW(&szBuff[cch], _countof(szBuff) - cch, format, va); +#else + _snwprintf(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? L"%ls" : L"%hs"), file); + if (!cat.IsGeneral()) + cch = _snwprintf(szBuff, _countof(szBuff), (bUnicode ? L"%ls - " : L"%hs - "), cat.m_name); + _vsnwprintf(&szBuff[cch], _countof(szBuff) - cch, format, va); +#endif + + _CrtDbgReportW(_CRT_WARN, szFile, line, NULL, L"%ls", szBuff); +} + +template <typename X_CHAR, typename Y_CHAR> +inline VOID __cdecl +AtlTraceEx(_In_opt_z_ const X_CHAR * file, + _In_ INT line, + _In_ const CTraceCategoryEasy& cat, + _In_ UINT level, + _In_z_ _Printf_format_string_ const Y_CHAR * format, + ...) +{ + va_list va; + va_start(va, format); + AtlTraceV(file, line, cat, level, format, va); + va_end(va); +} + +template <typename X_CHAR, typename Y_CHAR> +inline VOID __cdecl +AtlTraceEx(_In_opt_z_ const X_CHAR *file, + _In_ INT line, + _In_z_ _Printf_format_string_ const Y_CHAR *format, + ...) +{ + va_list va; + va_start(va, format); + AtlTraceV(file, line, atlTraceGeneral, 0, format, va); + va_end(va); +} + +inline VOID __stdcall +AtlTraceEx(_In_opt_z_ PCTSTR file, + _In_ INT line, + _In_ DWORD value) +{ + AtlTraceEx(file, line, TEXT("%ld (0x%lX)\n"), value, value); +} + +template <typename X_CHAR> +inline VOID __cdecl +AtlTrace(_In_z_ _Printf_format_string_ const X_CHAR *format, ...) +{ + va_list va; + va_start(va, format); + AtlTraceV(NULL, -1, atlTraceGeneral, 0, format, va); + va_end(va); +} + +} // namespace ATL + +#endif // DBG + +#ifndef ATLTRACE + #if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505 + #define ATLTRACE(format, ...) ATL::AtlTraceEx(__FILE__, __LINE__, format, ##__VA_ARGS__) + #else + #define ATLTRACE(format, ...) ((void)0) + #endif +#endif + +#define ATLTRACE2 ATLTRACE + +#if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505 + #define ATLTRACENOTIMPL(funcname) do { \ + ATLTRACE(atlTraceNotImpl, 0, #funcname " is not implemented.\n"); \ + return E_NOTIMPL; \ + } while (0) +#else + #define ATLTRACENOTIMPL(funcname) return E_NOTIMPL +#endif + +#ifndef _ATL_NO_AUTOMATIC_NAMESPACE +using namespace ATL; +#endif //!_ATL_NO_AUTOMATIC_NAMESPACE

1 0

[reactos] 01/01: [SFCFILES] Add sfcfiles dll and header file
by Eric Kohl 22 Jan '22

22 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=085f135f1a1f27e4e439e… commit 085f135f1a1f27e4e439eb99454408ef62bc57dd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 22 13:28:50 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 22 13:28:50 2022 +0100 [SFCFILES] Add sfcfiles dll and header file Sfcfiles.dll contains only a short list of protected files (WIP). --- dll/win32/CMakeLists.txt | 1 + dll/win32/sfcfiles/CMakeLists.txt | 10 +++++++ dll/win32/sfcfiles/sfcfiles.c | 59 +++++++++++++++++++++++++++++++++++++++ dll/win32/sfcfiles/sfcfiles.rc | 5 ++++ dll/win32/sfcfiles/sfcfiles.spec | 1 + sdk/include/psdk/sfcfiles.h | 25 +++++++++++++++++ 6 files changed, 101 insertions(+) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index c0238ebeea5..d596b912ab0 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -184,6 +184,7 @@ add_subdirectory(serialui) add_subdirectory(setupapi) add_subdirectory(sfc) add_subdirectory(sfc_os) +add_subdirectory(sfcfiles) add_subdirectory(shdoclc) add_subdirectory(shdocvw) add_subdirectory(shell32) diff --git a/dll/win32/sfcfiles/CMakeLists.txt b/dll/win32/sfcfiles/CMakeLists.txt new file mode 100644 index 00000000000..0cd46689e87 --- /dev/null +++ b/dll/win32/sfcfiles/CMakeLists.txt @@ -0,0 +1,10 @@ +spec2def(sfcfiles.dll sfcfiles.spec) + +list(APPEND SOURCE + sfcfiles.c + ${CMAKE_CURRENT_BINARY_DIR}/sfcfiles.def) + +add_library(sfcfiles MODULE ${SOURCE}) +set_module_type(sfcfiles win32dll) +add_importlibs(sfcfiles msvcrt kernel32 ntdll) +add_cd_file(TARGET sfcfiles DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/sfcfiles/sfcfiles.c b/dll/win32/sfcfiles/sfcfiles.c new file mode 100644 index 00000000000..da329e8c7c5 --- /dev/null +++ b/dll/win32/sfcfiles/sfcfiles.c @@ -0,0 +1,59 @@ +/* + * PROJECT: ReactOS System File Checker + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * FILE: dll/win32/sfcfiles/sfcfiles.c + * PURPOSE: List of protected files + * PROGRAMMERS: Copyright 2022 Eric Kohl (eric.kohl(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <ndk/umtypes.h> +#include <sfcfiles.h> + + +static +PROTECT_FILE_ENTRY +ProtectedFiles[] = +{ + {NULL, L"%systemroot%\\system32\\advapi32.dll", NULL}, + {NULL, L"%systemroot%\\system32\\comctl32.dll", NULL}, + {NULL, L"%systemroot%\\system32\\comdlg32.dll", NULL}, + {NULL, L"%systemroot%\\system32\\kernel32.dll", NULL}, + {NULL, L"%systemroot%\\system32\\ntdll.dll", NULL}, + {NULL, L"%systemroot%\\system32\\ntoskrnl.exe", NULL} +}; + + +BOOL +WINAPI +DllMain( + _In_ HINSTANCE hInstDLL, + _In_ DWORD fdwReason, + _In_ LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + + +NTSTATUS +WINAPI +SfcGetFiles( + _Out_ PPROTECT_FILE_ENTRY *ProtFileData, + _Out_ PULONG FileCount) +{ + *ProtFileData = ProtectedFiles; + *FileCount = ARRAYSIZE(ProtectedFiles); + return STATUS_SUCCESS; +} diff --git a/dll/win32/sfcfiles/sfcfiles.rc b/dll/win32/sfcfiles/sfcfiles.rc new file mode 100644 index 00000000000..ddcb33c079f --- /dev/null +++ b/dll/win32/sfcfiles/sfcfiles.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "System File Checker Files" +#define REACTOS_STR_INTERNAL_NAME "sfcfiles" +#define REACTOS_STR_ORIGINAL_FILENAME "sfcfiles.dll" +#include <reactos/version.rc> diff --git a/dll/win32/sfcfiles/sfcfiles.spec b/dll/win32/sfcfiles/sfcfiles.spec new file mode 100644 index 00000000000..a4d118834df --- /dev/null +++ b/dll/win32/sfcfiles/sfcfiles.spec @@ -0,0 +1 @@ +@ stdcall SfcGetFiles(ptr ptr) diff --git a/sdk/include/psdk/sfcfiles.h b/sdk/include/psdk/sfcfiles.h new file mode 100644 index 00000000000..b7a03179058 --- /dev/null +++ b/sdk/include/psdk/sfcfiles.h @@ -0,0 +1,25 @@ +#ifndef __SFCFILES_H +#define __SFCFILES_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _PROTECT_FILE_ENTRY +{ + PWSTR SourceFileName; + PWSTR FileName; + PWSTR InfName; +} PROTECT_FILE_ENTRY, *PPROTECT_FILE_ENTRY; + +NTSTATUS +WINAPI +SfcGetFiles( + _Out_ PPROTECT_FILE_ENTRY *ProtFileData, + _Out_ PULONG FileCount); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

[reactos] 01/01: [CRT] Fix MSVC version of call_handler
by Thomas Faber 22 Jan '22

22 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cf9b7985ecb92c3da4d6… commit 4cf9b7985ecb92c3da4d6cefb39a516826ecafe3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Jan 16 19:48:58 2022 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Jan 21 20:00:41 2022 -0500 [CRT] Fix MSVC version of call_handler --- sdk/lib/crt/except/i386/cpp.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/crt/except/i386/cpp.s b/sdk/lib/crt/except/i386/cpp.s index 0eaa5bc64f7..0a553936060 100644 --- a/sdk/lib/crt/except/i386/cpp.s +++ b/sdk/lib/crt/except/i386/cpp.s @@ -159,7 +159,7 @@ _call_handler: push esi push edi mov ebp, [esp + 24] - call dword ptr [esp + 29] + call dword ptr [esp + 20] pop edi pop esi pop ebx

1 0

[reactos] 01/01: [NTUSER] Improve NtUserGetThreadState (#4300)
by Katayama Hirofumi MZ 20 Jan '22

20 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41b87158ffe9be1a2fcbd… commit 41b87158ffe9be1a2fcbdd164c4e6bc5988fcc0f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 20 11:49:27 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 20 11:49:27 2022 +0900 [NTUSER] Improve NtUserGetThreadState (#4300) - Improve enum ThreadStateRoutines. - Improve NtUserGetThreadState function. - Improve CLIENTIMC structure. - Improve imm32 code. CORE-17732 --- dll/win32/imm32/ime.c | 5 ++--- dll/win32/imm32/imm.c | 12 ++++-------- win32ss/include/ntuser.h | 29 ++++++++++++++++++---------- win32ss/user/ntuser/misc.c | 47 ++++++++++++++++++++++++++++++++++------------ 4 files changed, 60 insertions(+), 33 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 4866bd00f5f..853951b352b 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -49,7 +49,7 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) DWORD dwSysInfoFlags = 0; LPIMEINFO pImeInfo = &pImeDpi->ImeInfo; - if (NtUserGetThreadState(16)) + if (NtUserGetThreadState(THREADSTATE_ISWINLOGON2)) dwSysInfoFlags |= IME_SYSINFO_WINLOGON; if (IS_IME_HKL(pImeDpi->hKL)) @@ -633,9 +633,8 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) if (!Imm32IsImmMode()) return NULL; - // FIXME: NtUserGetThreadState and enum ThreadStateRoutines are broken. if (hWnd == NULL) - return (HWND)NtUserGetThreadState(3); + return (HWND)NtUserGetThreadState(THREADSTATE_DEFAULTIMEWINDOW); return (HWND)NtUserQueryWindow(hWnd, QUERY_WINDOW_DEFAULT_IME); } diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index e916d44480f..b965e0d3093 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -606,8 +606,7 @@ HIMC WINAPI ImmCreateContext(void) RtlInitializeCriticalSection(&pClientImc->cs); - // FIXME: NtUserGetThreadState and enum ThreadStateRoutines are broken. - pClientImc->unknown = NtUserGetThreadState(13); + pClientImc->dwCompatFlags = (DWORD)NtUserGetThreadState(THREADSTATE_IMECOMPATFLAGS); return hIMC; } @@ -925,8 +924,7 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc) RtlInitializeCriticalSection(&pClientImc->cs); - // FIXME: NtUserGetThreadState and enum ThreadStateRoutines are broken. - pClientImc->unknown = NtUserGetThreadState(13); + pClientImc->dwCompatFlags = (DWORD)NtUserGetThreadState(THREADSTATE_IMECOMPATFLAGS); if (!NtUserUpdateInputContext(hImc, UIC_CLIENTIMCDATA, (DWORD_PTR)pClientImc)) { @@ -979,8 +977,7 @@ static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD dwContextFlags) if (!hWnd) { - // FIXME: NtUserGetThreadState and enum ThreadStateRoutines are broken. - hIMC = (HIMC)NtUserGetThreadState(4); + hIMC = (HIMC)NtUserGetThreadState(THREADSTATE_DEFAULTINPUTCONTEXT); goto Quit; } @@ -1275,8 +1272,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) return TRUE; hKL = GetKeyboardLayout(0); - // FIXME: NtUserGetThreadState and enum ThreadStateRoutines are broken. - hIMC = (HIMC)NtUserGetThreadState(4); + hIMC = (HIMC)NtUserGetThreadState(THREADSTATE_DEFAULTINPUTCONTEXT); Imm32CleanupContext(hIMC, hKL, TRUE); break; diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index e6db897fa4b..dab6b267781 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1294,7 +1294,7 @@ typedef struct tagCLIENTIMC HANDLE hInputContext; /* LocalAlloc'ed LHND */ LONG cLockObj; DWORD dwFlags; - DWORD unknown; + DWORD dwCompatFlags; RTL_CRITICAL_SECTION cs; UINT uCodePage; HKL hKL; @@ -1305,6 +1305,7 @@ typedef struct tagCLIENTIMC C_ASSERT(offsetof(CLIENTIMC, hInputContext) == 0x0); C_ASSERT(offsetof(CLIENTIMC, cLockObj) == 0x4); C_ASSERT(offsetof(CLIENTIMC, dwFlags) == 0x8); +C_ASSERT(offsetof(CLIENTIMC, dwCompatFlags) == 0xc); C_ASSERT(offsetof(CLIENTIMC, cs) == 0x10); C_ASSERT(offsetof(CLIENTIMC, uCodePage) == 0x28); C_ASSERT(offsetof(CLIENTIMC, hKL) == 0x2c); @@ -2550,20 +2551,28 @@ NtUserGetThreadDesktop( enum ThreadStateRoutines { - THREADSTATE_GETTHREADINFO, - THREADSTATE_INSENDMESSAGE, - THREADSTATE_FOCUSWINDOW, + THREADSTATE_FOCUSWINDOW = 0, THREADSTATE_ACTIVEWINDOW, THREADSTATE_CAPTUREWINDOW, - THREADSTATE_PROGMANWINDOW, - THREADSTATE_TASKMANWINDOW, - THREADSTATE_GETMESSAGETIME, + THREADSTATE_DEFAULTIMEWINDOW, + THREADSTATE_DEFAULTINPUTCONTEXT, THREADSTATE_GETINPUTSTATE, - THREADSTATE_UPTIMELASTREAD, - THREADSTATE_FOREGROUNDTHREAD, THREADSTATE_GETCURSOR, + THREADSTATE_CHANGEBITS, + THREADSTATE_UPTIMELASTREAD, THREADSTATE_GETMESSAGEEXTRAINFO, - THREADSTATE_UNKNOWN13 + THREADSTATE_INSENDMESSAGE, + THREADSTATE_GETMESSAGETIME, + THREADSTATE_FOREGROUNDTHREAD, + THREADSTATE_IMECOMPATFLAGS, + THREADSTATE_OLDKEYBOARDLAYOUT, + THREADSTATE_ISWINLOGON, + THREADSTATE_ISWINLOGON2, + THREADSTATE_UNKNOWN17, + THREADSTATE_UNKNOWN18, + THREADSTATE_GETTHREADINFO = 100, /* FIXME: Delete this HACK */ + THREADSTATE_PROGMANWINDOW, /* FIXME: Delete this HACK */ + THREADSTATE_TASKMANWINDOW, /* FIXME: Delete this HACK */ }; DWORD_PTR diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 10fa0144f16..00393431603 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -232,6 +232,7 @@ NtUserGetThreadState( DWORD Routine) { DWORD_PTR ret = 0; + PTHREADINFO pti; TRACE("Enter NtUserGetThreadState\n"); if (Routine != THREADSTATE_GETTHREADINFO) @@ -243,9 +244,11 @@ NtUserGetThreadState( UserEnterExclusive(); } + pti = PsGetCurrentThreadWin32Thread(); + switch (Routine) { - case THREADSTATE_GETTHREADINFO: + case THREADSTATE_GETTHREADINFO: /* FIXME: Delete this HACK */ GetW32ThreadInfo(); break; case THREADSTATE_FOCUSWINDOW: @@ -255,10 +258,10 @@ NtUserGetThreadState( /* FIXME: Should use UserEnterShared */ ret = (DWORD_PTR)IntGetCapture(); break; - case THREADSTATE_PROGMANWINDOW: + case THREADSTATE_PROGMANWINDOW: /* FIXME: Delete this HACK */ ret = (DWORD_PTR)GetW32ThreadInfo()->pDeskInfo->hProgmanWindow; break; - case THREADSTATE_TASKMANWINDOW: + case THREADSTATE_TASKMANWINDOW: /* FIXME: Delete this HACK */ ret = (DWORD_PTR)GetW32ThreadInfo()->pDeskInfo->hTaskManWindow; break; case THREADSTATE_ACTIVEWINDOW: @@ -293,12 +296,8 @@ NtUserGetThreadState( break; case THREADSTATE_UPTIMELASTREAD: - { - PTHREADINFO pti; - pti = PsGetCurrentThreadWin32Thread(); - pti->pcti->timeLastRead = EngGetTickCount32(); - break; - } + pti->pcti->timeLastRead = EngGetTickCount32(); + break; case THREADSTATE_GETINPUTSTATE: ret = LOWORD(IntGetQueueStatus(QS_POSTMESSAGE|QS_TIMER|QS_PAINT|QS_SENDMESSAGE|QS_INPUT)) & (QS_KEY | QS_MOUSEBUTTON); @@ -313,9 +312,33 @@ NtUserGetThreadState( break; case THREADSTATE_GETMESSAGEEXTRAINFO: ret = (DWORD_PTR)MsqGetMessageExtraInfo(); - break; - case THREADSTATE_UNKNOWN13: - ret = FALSE; /* FIXME: See imm32 */ + break; + case THREADSTATE_DEFAULTIMEWINDOW: + if (pti->spwndDefaultIme) + ret = (ULONG_PTR)UserHMGetHandle(pti->spwndDefaultIme); + break; + case THREADSTATE_DEFAULTINPUTCONTEXT: + if (pti->spDefaultImc) + ret = (ULONG_PTR)UserHMGetHandle(pti->spDefaultImc); + break; + case THREADSTATE_CHANGEBITS: + ret = pti->pcti->fsChangeBits; + break; + case THREADSTATE_IMECOMPATFLAGS: + ret = pti->ppi->dwImeCompatFlags; + break; + case THREADSTATE_OLDKEYBOARDLAYOUT: + ret = (ULONG_PTR)pti->hklPrev; + break; + case THREADSTATE_ISWINLOGON: + case THREADSTATE_ISWINLOGON2: + ret = (gpidLogon == PsGetCurrentProcessId()); + break; + case THREADSTATE_UNKNOWN17: + /* FIXME */ + break; + case THREADSTATE_UNKNOWN18: + ret = TRUE; break; }

1 0

[reactos] 01/01: [TRANSLATION] Cumulative update for Russian (ru-RU) translation
by Stanislav Motylkov 18 Jan '22

18 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2318f7f4362dab05870a5… commit 2318f7f4362dab05870a56d41d3b1e2e67a33a4b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jan 18 23:42:06 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jan 18 23:42:06 2022 +0300 [TRANSLATION] Cumulative update for Russian (ru-RU) translation [SYSDM] Addendum to 5a2911d7, e58b4a49, ea2ca8fa. [SHELL32] Addendum to 16f64a95, 44bb99cc, 2ae526a0, 34b0f3e4, fd39a292. [SYSSETUP] Addendum to 556cfbf5, 6f1a57a9, 3f053db3. [SAMSRV] Addendum to 6f1a57a9. [BOOTDATA] Addendum to 63cd5d54. [INF] Addendum to fb500b88. --- boot/bootdata/hivesys.inf | 4 ++-- dll/cpl/sysdm/lang/ru-RU.rc | 52 ++++++++++++++++++++-------------------- dll/win32/samsrv/lang/ru-RU.rc | 32 ++++++++++++------------- dll/win32/shell32/lang/ru-RU.rc | 38 ++++++++++++++--------------- dll/win32/syssetup/lang/ru-RU.rc | 14 +++++------ media/inf/volume.inf | 6 +++++ 6 files changed, 76 insertions(+), 70 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index cc4b106ab3e..d0b05adb09d 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2924,8 +2924,8 @@ SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services th SCHEDULE_SERVICE="Планировщик заданий" SCHEDULE_SERVICE_DESCRIPTION="Позволяет запускать программы в определенное время." -SECLOGON_SERVICE="Secondary Logon" -SECLOGON_SERVICE_DESCRIPTION="Allows to start processes under alternative credentials." +SECLOGON_SERVICE="Вторичный вход в систему" +SECLOGON_SERVICE_DESCRIPTION="Позволяет запускать процессы под другими учётными данными." SERVER_SERVICE="Сервер" SERVER_SERVICE_DESCRIPTION="Поддержка совместного использования файлов, принтеров и ресурсов в сети." diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 382b1316805..6477c525a8b 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -167,29 +167,29 @@ END IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Change Profile Type" +CAPTION "Изменение типа профиля" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 - AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 - AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + AUTORADIOBUTTON "&Перемещаемый профиль", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Локальный профиль", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 + PUSHBUTTON "Отмена", IDCANCEL, 122, 82, 50, 14 END IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Copy To" +CAPTION "Копирование профиля" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + GROUPBOX "&Копировать профиль в", -1, 8, 9, 185, 52 EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL - PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 - GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + PUSHBUTTON "&Обзор", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Разрешить использование", -1, 8, 77, 185, 48 LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 - PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + PUSHBUTTON "&Изменить", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 + PUSHBUTTON "Отмена", IDCANCEL, 204, 30, 50, 14 END IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 @@ -291,11 +291,11 @@ BEGIN EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 PUSHBUTTON "Отмена", IDCANCEL, 314, 50, 50, 14 - PUSHBUTTON "Browse &Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 - PUSHBUTTON "Browse &Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 + PUSHBUTTON "Обзор &каталога...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Обзор ф&айлов...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 END -IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 324, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION | WS_THICKFRAME | WS_VISIBLE CAPTION "Изменение переменной" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -303,15 +303,15 @@ BEGIN SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE - PUSHBUTTON "&New", IDC_BUTTON_NEW, 242, 10, 50, 14 - PUSHBUTTON "&Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 - PUSHBUTTON "&Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 - PUSHBUTTON "&Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 - PUSHBUTTON "Move &Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 - PUSHBUTTON "Move D&own", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 - PUSHBUTTON "Edit &text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 - DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 - PUSHBUTTON "Отмена", IDCANCEL, 242, 228, 50, 14 + PUSHBUTTON "Соз&дать", IDC_BUTTON_NEW, 242, 10, 74, 14 + PUSHBUTTON "&Изменить", IDC_BUTTON_EDIT, 242, 30, 74, 14 + PUSHBUTTON "Об&зор...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 74, 14 + PUSHBUTTON "&Удалить", IDC_BUTTON_DELETE, 242, 70, 74, 14 + PUSHBUTTON "Вве&рх", IDC_BUTTON_MOVE_UP, 242, 100, 74, 14 + PUSHBUTTON "&Вниз", IDC_BUTTON_MOVE_DOWN, 242, 120, 74, 14 + PUSHBUTTON "Из&менить текст...", IDC_BUTTON_EDIT_TEXT, 242, 150, 74, 14 + DEFPUSHBUTTON "OK", IDOK, 212, 228, 50, 14 + PUSHBUTTON "Отмена", IDCANCEL, 266, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -352,7 +352,7 @@ BEGIN IDS_USERPROFILE_CONFIRM_DELETE_TITLE "Подтверждение удаления" IDS_USERPROFILE_ACCOUNT_UNKNOWN "Неизвестный профиль" IDS_USERPROFILE_ACCOUNT_DELETED "Удалённый профиль" - IDS_USERPROFILE_TYPE_TEXT "When %s logs onto this computer, should the operating system use the roaming profile or just the locally cached copy of the roaming profile." + IDS_USERPROFILE_TYPE_TEXT "Когда %s выполняет вход на этом компьютере, операционная система должна использовать перемещаемый профиль, или только его закешированную копию." IDS_MESSAGEBOXTITLE "Панель управления системы" IDS_WARNINITIALSIZE "Введите числовое значение исходного размера файла подкачки." IDS_WARNMAXIMUMSIZE "Введите числовое значение для параметра максимальный размер файла подкачки." @@ -367,7 +367,7 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Профиль с таким названием уже существует." IDS_HWPROFILE_PROFILE "Профиль" IDS_HWPROFILE_WARNING "Внимание" - IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." - IDS_ENVIRONMENT_WARNING_TITLE "System Properties" - IDS_FILE_BROWSE_FILTER "All Files (*.*)\0*.*\0" + IDS_ENVIRONMENT_WARNING "Все изменения, внесённые здесь, будут отменены, а это значение будет отредактировано в виде текста." + IDS_ENVIRONMENT_WARNING_TITLE "Свойства системы" + IDS_FILE_BROWSE_FILTER "Все файлы (*.*)\0*.*\0" END diff --git a/dll/win32/samsrv/lang/ru-RU.rc b/dll/win32/samsrv/lang/ru-RU.rc index 22c71c045d9..0c56af99e4f 100644 --- a/dll/win32/samsrv/lang/ru-RU.rc +++ b/dll/win32/samsrv/lang/ru-RU.rc @@ -15,27 +15,27 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Категория опытных пользователей обладает ограниченными административными правами." IDS_ALIAS_USERS_NAME "Пользователи" IDS_ALIAS_USERS_COMMENT "Пользователи не имеют прав на изменение параметров системы и могут запускать большинство приложений." - IDS_ALIAS_PRINT_OPS_NAME "Print Operators" - IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" - IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" - IDS_ALIAS_REPLICATOR_NAME "Replicator" - IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" - IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" - IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" - IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" - IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" - IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" - IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" - IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" - IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" + IDS_ALIAS_PRINT_OPS_NAME "Операторы печати" + IDS_ALIAS_PRINT_OPS_COMMENT "Члены группы имеют право администрировать принтеры домена." + IDS_ALIAS_BACKUP_OPS_NAME "Операторы архива" + IDS_ALIAS_BACKUP_OPS_COMMENT "Операторы архива могут перекрывать ограничения доступа только в целях копирования и восстановления файлов." + IDS_ALIAS_REPLICATOR_NAME "Репликатор" + IDS_ALIAS_REPLICATOR_COMMENT "Поддержка репликации файлов в домене." + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Пользователи удаленного рабочего стола" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Члены этой группы имеют право на выполнение удалённого входа." + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Операторы настройки сети" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Члены этой группы могут иметь некоторые административные права для управления сетевыми параметрами." + IDS_ALIAS_MONITORING_USERS_NAME "Пользователи системного монитора" + IDS_ALIAS_MONITORING_USERS_COMMENT "Члены данной группы имеют удалённый доступ к системному монитору этого компьютера." + IDS_ALIAS_LOGGING_USERS_NAME "Пользователи журналов производительности" + IDS_ALIAS_LOGGING_USERS_COMMENT "Члены этой группы могут планировать ведение журнала счётчиков производительности через удалённый доступ." /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. */ - IDS_USER_ADMINISTRATOR_NAME "Administrator"// Не изменять, иначе будут глюки с нерусскими программами + IDS_USER_ADMINISTRATOR_NAME "Администратор" IDS_USER_ADMINISTRATOR_COMMENT "Встроенная учетная запись администратора компьютера/домена." - IDS_USER_GUEST_NAME "Guest"// Не изменять, иначе будут глюки с нерусскими программами + IDS_USER_GUEST_NAME "Гость" IDS_USER_GUEST_COMMENT "Встроенная учетная запись для доступа гостей к компьютеру или домену." END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index fd4b752c8b8..b25f7e63c0d 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -807,11 +807,11 @@ BEGIN IDS_MOVEERRORTITLE "Ошибка при перемещении папки или файла" IDS_COPYERRORTITLE "Ошибка при копировании папки или файла" - IDS_MOVEERRORSAMEFOLDER "Cannot move '%s': The destination folder is the same as the source folder." - IDS_MOVEERRORSAME "Cannot move '%s': The source and destination file names are the same." - IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." - IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERRORSAMEFOLDER "Не удаётся переместить '%s': Папка назначения совпадает с исходной папкой." + IDS_MOVEERRORSAME "Не удаётся переместить '%s': Имена исходного и целевого файлов совпадают." + IDS_COPYERRORSAME "Не удаётся скопировать '%s': Имена исходного и целевого файлов совпадают." + IDS_MOVEERRORSUBFOLDER "Не удаётся переместить '%s': Папка назначения является подпапкой исходной папки." + IDS_COPYERRORSUBFOLDER "Не удаётся скопировать '%s': Папка назначения является подпапкой исходной папки." IDS_MOVEERROR "Не удаётся переместить '%s': %s" IDS_COPYERROR "Не удаётся скопировать '%s': %s" @@ -844,13 +844,13 @@ BEGIN IDS_SHUTDOWN_PROMPT "Вы действительно хотите завершить работу ReactOS?" /* Format Dialog Strings */ - IDS_FORMAT_TITLE "Format Local Disk" - IDS_FORMAT_WARNING "WARNING: Formatting will erase ALL data on this disk.\nTo format the disk, click OK. To quit, click CANCEL." - IDS_FORMAT_COMPLETE "Format Complete." + IDS_FORMAT_TITLE "Форматирование локального диска" + IDS_FORMAT_WARNING "ВНИМАНИЕ: Форматирование уничтожит ВСЕ данные на этом диске.\nНажмите кнопку ""OK"" для запуска форматирования, ""Отмена"" для его отмены." + IDS_FORMAT_COMPLETE "Форматирование завершено." /* Warning format system drive dialog strings */ - IDS_NO_FORMAT_TITLE "Cannot format this volume" - IDS_NO_FORMAT "This volume cannot be formatted! It contains important system files in order for ReactOS to run." + IDS_NO_FORMAT_TITLE "Невозможно отформатировать этот том" + IDS_NO_FORMAT "Этот том не может быть отформатирован! На нём находятся важные системные файлы, необходимые для работы ReactOS." /* Run File dialog */ IDS_RUNDLG_ERROR "Невозможно отобразить диалоговое окно Выполнить (внутренняя ошибка)" @@ -930,14 +930,14 @@ BEGIN IDS_COM_FILE "Приложение DOS" IDS_CPL_FILE "Элемент панели управления" IDS_CUR_FILE "Курсор" - IDS_DB__FILE "Database File" + IDS_DB__FILE "Файл базы данных" IDS_DLL_FILE "Расширение приложения" IDS_DRV_FILE "Драйвер устройства" - IDS_EFI_FILE "Extensible Firmware Interface Executable" + IDS_EFI_FILE "Исполняемый файл Extensible Firmware Interface" IDS_EXE_FILE "Приложение" - IDS_NLS_FILE "National Language Support File" - IDS_OCX_FILE "ActiveX Control" - IDS_TLB_FILE "Type Library" + IDS_NLS_FILE "Файл поддержки национальных языков" + IDS_OCX_FILE "Элемент управления ActiveX" + IDS_TLB_FILE "Библиотека типов" IDS_FON_FILE "Файл шрифта" IDS_TTF_FILE "Файл шрифта TrueType" IDS_OTF_FILE "Файл шрифта OpenType" @@ -945,7 +945,7 @@ BEGIN IDS_ICO_FILE "Значок" IDS_INI_FILE "Файл конфигурации" IDS_LNK_FILE "Ярлык" - IDS_NT__FILE "NT DOS32 Configuration File" + IDS_NT__FILE "Файл конфигурации NT DOS32" IDS_PIF_FILE "Информация о приложении NT VDM" IDS_SCR_FILE "Заставка" IDS_SYS_FILE "Системный файл" @@ -1036,8 +1036,8 @@ BEGIN IDS_SYSTEMFOLDER "Системная папка" /* For IDD_LOG_OFF_FANCY */ - IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." - IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_DESC "Закрывает программы и завершает ваш сеанс ReactOS." + IDS_SWITCH_USER_DESC "Позволяет другому пользователю войти в систему, оставляя открытыми ваши приложения и файлы.\r\n\r\n(Можно также выполнить переключение пользователей, нажав сочетание клавиш Windows + L.)" IDS_LOG_OFF_TITLE "Выход" - IDS_SWITCH_USER_TITLE "Switch User" + IDS_SWITCH_USER_TITLE "Сменить пользователя" END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 39d0cf5ad72..850091d370f 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -67,7 +67,7 @@ BEGIN LTEXT "&Имя компьютера:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "При установке будет создан профиль пользователя с именем Administrator. Вы можете использовать этот профиль, если вам нужно получить права администратора.", IDC_STATIC, 54, 57, 250, 25 + LTEXT "При установке будет создан профиль пользователя с именем Администратор. Вы можете использовать этот профиль, если вам нужно получить права администратора.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Введите пароль администратора (не более 127 символов).", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Пароль администратора:", IDC_STATIC, 54, 104, 96, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD @@ -120,9 +120,9 @@ CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Регистрация компонентов", IDC_TASKTEXT1, 65, 27, 232, 8 - LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 - LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 - LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "Установка элементов меню ""Пуск""", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Сохранение параметров настройки", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Удаление временных файлов", IDC_TASKTEXT4, 65, 63, 232, 8 LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END @@ -190,8 +190,8 @@ BEGIN IDS_LAYOUTTEXT "Ваш язык и метод ввода текста по умолчанию: %s раскладка клавиатуры" IDS_DATETIMETITLE "Дата и время" IDS_DATETIMESUBTITLE "Установите правильную дату и время на вашем компьютере." - IDS_PROCESSTITLE "Finishing the Installation" - IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." + IDS_PROCESSTITLE "Завершение установки" + IDS_PROCESSSUBTITLE "Подождите, пока программа установки выполнит последние шаги." IDS_THEMESELECTIONTITLE "Внешний вид" IDS_THEMESELECTIONSUBTITLE "Выберите тему, которую вы предпочитаете" END @@ -212,7 +212,7 @@ BEGIN * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. * Also check the IDD_COMPUTERPAGE dialog. */ - IDS_ADMINISTRATOR_NAME "Administrator" + IDS_ADMINISTRATOR_NAME "Администратор" IDS_MACHINE_OWNER_NAME "Владелец" END diff --git a/media/inf/volume.inf b/media/inf/volume.inf index 95cdd8b56e0..b8fa4ec560d 100644 --- a/media/inf/volume.inf +++ b/media/inf/volume.inf @@ -49,6 +49,12 @@ VolumeClassName = "儲存磁碟區" GenericMfg = "(標準儲存磁碟區)" STORAGE\Volume.DeviceDesc = "儲存磁碟區" +[Strings.0419] +ReactOS = "Команда ReactOS" +VolumeClassName = "Тома хранения" +GenericMfg = "(Стандартные тома хранения)" +STORAGE\Volume.DeviceDesc = "Том хранения" + [Strings.0816] ReactOS = "Equipa ReactOS" VolumeClassName = "Volumes de armazenamento"

1 0

[reactos] 01/01: [NTUSER] Initialize correctly CaretWidth value. (#4297) CORE-13984 CORE-14359 CORE-16624
by Julio Carchi 17 Jan '22

17 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=292e6a429fb32f2f00388… commit 292e6a429fb32f2f003888d31c3c55e2990a9f2e Author: Julio Carchi <julcar(a)informaticos.com> AuthorDate: Mon Jan 17 18:36:49 2022 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 18 00:36:49 2022 +0100 [NTUSER] Initialize correctly CaretWidth value. (#4297) CORE-13984 CORE-14359 CORE-16624 Fixes: CORE-13984 LibreOffice Writer shows no blinking caret CORE-14359 Apache Open Office 4.1.2 SWriter - no blinking Caret CORE-16624 KVIRC, no blinking caret in configuration edit controls --- win32ss/user/ntuser/sysparams.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 18208c30c17..0e68f25ced0 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -73,6 +73,7 @@ static const WCHAR* VAL_SCRLLLINES = L"WheelScrollLines"; static const WCHAR* VAL_CLICKLOCKTIME = L"ClickLockTime"; static const WCHAR* VAL_PAINTDESKVER = L"PaintDesktopVersion"; static const WCHAR* VAL_CARETRATE = L"CursorBlinkRate"; +static const WCHAR* VAL_CARETWIDTH = L"CaretWidth"; #if (_WIN32_WINNT >= 0x0600) static const WCHAR* VAL_SCRLLCHARS = L"WheelScrollChars"; #endif @@ -288,6 +289,7 @@ SpiUpdatePerUserSystemParameters(VOID) gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); gspv.dwMouseClickLockTime = SpiLoadDWord(KEY_DESKTOP, VAL_CLICKLOCKTIME, 1200); gpsi->dtCaretBlink = SpiLoadInt(KEY_DESKTOP, VAL_CARETRATE, 530); + gspv.dwCaretWidth = SpiLoadDWord(KEY_DESKTOP, VAL_CARETWIDTH, 1); gspv.dwUserPrefMask = SpiLoadUserPrefMask(UPM_DEFAULT); gspv.bMouseClickLock = (gspv.dwUserPrefMask & UPM_CLICKLOCK) != 0; gspv.bMouseCursorShadow = (gspv.dwUserPrefMask & UPM_CURSORSHADOW) != 0;

1 0

[reactos] 02/02: [SHELL32] List CD-ROM drives in the "Hardware" tab of disk properties
by Stanislav Motylkov 17 Jan '22

17 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e105aefc1c2b7239cc01a… commit e105aefc1c2b7239cc01a98e82d61b8bcf62363a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jan 17 21:04:04 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jan 17 21:04:04 2022 +0300 [SHELL32] List CD-ROM drives in the "Hardware" tab of disk properties CORE-17397 --- dll/win32/shell32/dialogs/drvdefext.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/dialogs/drvdefext.cpp b/dll/win32/shell32/dialogs/drvdefext.cpp index 94be4ebc13f..949ba581f84 100644 --- a/dll/win32/shell32/dialogs/drvdefext.cpp +++ b/dll/win32/shell32/dialogs/drvdefext.cpp @@ -24,6 +24,7 @@ #define _USE_MATH_DEFINES #include <math.h> +#include <devguid.h> #define NTOS_MODE_USER #include <ndk/iofuncs.h> @@ -31,8 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -static const GUID GUID_DEVCLASS_DISKDRIVE = {0x4d36e967L, 0xe325, 0x11ce, {0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18}}; - typedef enum { HWPD_STANDARDLIST = 0, @@ -653,10 +652,12 @@ CDrvDefExt::HardwarePageProc( { case WM_INITDIALOG: { - GUID Guid = GUID_DEVCLASS_DISKDRIVE; + GUID Guids[2]; + Guids[0] = GUID_DEVCLASS_DISKDRIVE; + Guids[1] = GUID_DEVCLASS_CDROM; /* create the hardware page */ - DeviceCreateHardwarePageEx(hwndDlg, &Guid, 1, HWPD_STANDARDLIST); + DeviceCreateHardwarePageEx(hwndDlg, Guids, _countof(Guids), HWPD_STANDARDLIST); break; } }

1 0

[reactos] 01/02: [SAMSRV] Fix typo in IDS_ALIAS_BACKUP_OPS_COMMENT (en-US and others)
by Stanislav Motylkov 17 Jan '22

17 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bd2cb13b56923079da04… commit 5bd2cb13b56923079da045190a4b59428abaddd0 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jan 17 20:40:31 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jan 17 20:40:31 2022 +0300 [SAMSRV] Fix typo in IDS_ALIAS_BACKUP_OPS_COMMENT (en-US and others) Addendum to f1e768c0. --- dll/win32/samsrv/lang/en-US.rc | 2 +- dll/win32/samsrv/lang/es-ES.rc | 2 +- dll/win32/samsrv/lang/eu-ES.rc | 2 +- dll/win32/samsrv/lang/hi-IN.rc | 2 +- dll/win32/samsrv/lang/hu-HU.rc | 2 +- dll/win32/samsrv/lang/it-IT.rc | 2 +- dll/win32/samsrv/lang/ja-JP.rc | 2 +- dll/win32/samsrv/lang/pl-PL.rc | 2 +- dll/win32/samsrv/lang/pt-PT.rc | 2 +- dll/win32/samsrv/lang/ro-RO.rc | 2 +- dll/win32/samsrv/lang/ru-RU.rc | 2 +- dll/win32/samsrv/lang/sq-AL.rc | 2 +- dll/win32/samsrv/lang/zh-CN.rc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/win32/samsrv/lang/en-US.rc b/dll/win32/samsrv/lang/en-US.rc index cb14568088f..0444280d792 100644 --- a/dll/win32/samsrv/lang/en-US.rc +++ b/dll/win32/samsrv/lang/en-US.rc @@ -16,7 +16,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members of this group can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/es-ES.rc b/dll/win32/samsrv/lang/es-ES.rc index 9e947f9b41d..94cb9021ab2 100644 --- a/dll/win32/samsrv/lang/es-ES.rc +++ b/dll/win32/samsrv/lang/es-ES.rc @@ -17,7 +17,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/eu-ES.rc b/dll/win32/samsrv/lang/eu-ES.rc index 96f9634413c..2464fe5c001 100644 --- a/dll/win32/samsrv/lang/eu-ES.rc +++ b/dll/win32/samsrv/lang/eu-ES.rc @@ -23,7 +23,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/hi-IN.rc b/dll/win32/samsrv/lang/hi-IN.rc index 0b7f1d8ae8d..5a73af29093 100644 --- a/dll/win32/samsrv/lang/hi-IN.rc +++ b/dll/win32/samsrv/lang/hi-IN.rc @@ -23,7 +23,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/hu-HU.rc b/dll/win32/samsrv/lang/hu-HU.rc index 6b29b4a33db..b16084a30c1 100644 --- a/dll/win32/samsrv/lang/hu-HU.rc +++ b/dll/win32/samsrv/lang/hu-HU.rc @@ -16,7 +16,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/it-IT.rc b/dll/win32/samsrv/lang/it-IT.rc index de9d0dc749f..2092937e911 100644 --- a/dll/win32/samsrv/lang/it-IT.rc +++ b/dll/win32/samsrv/lang/it-IT.rc @@ -16,7 +16,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/ja-JP.rc b/dll/win32/samsrv/lang/ja-JP.rc index 1e3cfef799d..b9ee44eac07 100644 --- a/dll/win32/samsrv/lang/ja-JP.rc +++ b/dll/win32/samsrv/lang/ja-JP.rc @@ -16,7 +16,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/pl-PL.rc b/dll/win32/samsrv/lang/pl-PL.rc index 9a0a0c936a3..aeef0210b2a 100644 --- a/dll/win32/samsrv/lang/pl-PL.rc +++ b/dll/win32/samsrv/lang/pl-PL.rc @@ -16,7 +16,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/pt-PT.rc b/dll/win32/samsrv/lang/pt-PT.rc index 26fa4c8aa9c..eaad707f43e 100644 --- a/dll/win32/samsrv/lang/pt-PT.rc +++ b/dll/win32/samsrv/lang/pt-PT.rc @@ -16,7 +16,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/ro-RO.rc b/dll/win32/samsrv/lang/ro-RO.rc index 3515bd75187..a4604d10064 100644 --- a/dll/win32/samsrv/lang/ro-RO.rc +++ b/dll/win32/samsrv/lang/ro-RO.rc @@ -18,7 +18,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/ru-RU.rc b/dll/win32/samsrv/lang/ru-RU.rc index 3bbfb0a40d3..22c71c045d9 100644 --- a/dll/win32/samsrv/lang/ru-RU.rc +++ b/dll/win32/samsrv/lang/ru-RU.rc @@ -18,7 +18,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/sq-AL.rc b/dll/win32/samsrv/lang/sq-AL.rc index 1d59af803df..2710f65626c 100644 --- a/dll/win32/samsrv/lang/sq-AL.rc +++ b/dll/win32/samsrv/lang/sq-AL.rc @@ -20,7 +20,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" diff --git a/dll/win32/samsrv/lang/zh-CN.rc b/dll/win32/samsrv/lang/zh-CN.rc index cca89f9da56..d5d979189b4 100644 --- a/dll/win32/samsrv/lang/zh-CN.rc +++ b/dll/win32/samsrv/lang/zh-CN.rc @@ -19,7 +19,7 @@ BEGIN IDS_ALIAS_PRINT_OPS_NAME "Print Operators" IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users"

1 0

[reactos] 01/01: [USETUP] Default to en-US output codepage when initializing the console. Addendum to commit 9f201d462.
by Hermès Bélusca-Maïto 17 Jan '22

17 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6605905678c3bcac03a8… commit c6605905678c3bcac03a8d6364ea5e5f4b06bd85 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 17 16:16:10 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 17 16:16:10 2022 +0100 [USETUP] Default to en-US output codepage when initializing the console. Addendum to commit 9f201d462. Reported by julenuri. --- base/setup/usetup/console.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/setup/usetup/console.c b/base/setup/usetup/console.c index 5cbcf839be1..2097a59193c 100644 --- a/base/setup/usetup/console.c +++ b/base/setup/usetup/console.c @@ -113,6 +113,9 @@ AllocConsole(VOID) return FALSE; } + /* Default to en-US output codepage */ + SetConsoleOutputCP(437); + /* Open the keyboard */ InitializeObjectAttributes(&ObjectAttributes, &KeyboardName,

1 0

[reactos] 01/01: [WIN32KNT_APITEST] Strengthen NtUserGetThreadState testcase (#4291)
by Katayama Hirofumi MZ 17 Jan '22

17 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bec8ff63e5558a3c2525… commit 4bec8ff63e5558a3c2525b8ee006a668827430e2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 17 16:01:31 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 17 16:01:31 2022 +0900 [WIN32KNT_APITEST] Strengthen NtUserGetThreadState testcase (#4291) Add some paramters to test on. CORE-17732 --- .../apitests/win32nt/ntuser/NtUserGetThreadState.c | 80 +++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c index 2ff394838b2..772d00b7355 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS api tests * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Test for NtUserGetThreadState - * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * COPYRIGHT: Copyright 2021-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include <win32nt.h> @@ -73,6 +73,9 @@ static VOID DoTest_EDIT(VOID) { HWND hWnd, hImeWnd; HIMC hIMC; + HCURSOR hCursor; + LPARAM ExtraInfo; + LONG MsgTime; hWnd = CreateWindowA("EDIT", "Test", ES_LEFT | ES_MULTILINE | WS_VISIBLE, 0, 0, 50, 30, @@ -83,6 +86,9 @@ static VOID DoTest_EDIT(VOID) hIMC = ImmGetContext(hWnd); ok_int(hIMC != NULL, TRUE); ok_int(hIMC == (HIMC)NtUserGetThreadState(4), TRUE); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -92,8 +98,14 @@ static VOID DoTest_EDIT(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); SetCapture(hWnd); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -103,8 +115,14 @@ static VOID DoTest_EDIT(VOID) DO_CHECK(2, hWnd); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); ReleaseCapture(); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -114,8 +132,14 @@ static VOID DoTest_EDIT(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); SetFocus(hWnd); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -125,8 +149,14 @@ static VOID DoTest_EDIT(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); SetActiveWindow(hWnd); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -136,8 +166,14 @@ static VOID DoTest_EDIT(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); SetActiveWindow(NULL); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -147,6 +183,9 @@ static VOID DoTest_EDIT(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); ImmReleaseContext(hWnd, hIMC); DestroyWindow(hWnd); @@ -156,6 +195,9 @@ static VOID DoTest_BUTTON(VOID) { HWND hWnd, hImeWnd; HIMC hIMC; + HCURSOR hCursor; + LPARAM ExtraInfo; + LONG MsgTime; hWnd = CreateWindowA("BUTTON", "Test", BS_PUSHBUTTON | WS_VISIBLE, 0, 0, 50, 30, @@ -168,6 +210,9 @@ static VOID DoTest_BUTTON(VOID) hIMC = (HIMC)NtUserGetThreadState(4); ok_int(hIMC != NULL, TRUE); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -177,8 +222,14 @@ static VOID DoTest_BUTTON(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); SetCapture(hWnd); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -188,8 +239,14 @@ static VOID DoTest_BUTTON(VOID) DO_CHECK(2, hWnd); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); ReleaseCapture(); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -199,8 +256,14 @@ static VOID DoTest_BUTTON(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); SetFocus(hWnd); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -210,8 +273,14 @@ static VOID DoTest_BUTTON(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); SetActiveWindow(hWnd); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -221,8 +290,14 @@ static VOID DoTest_BUTTON(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); SetActiveWindow(NULL); + hCursor = GetCursor(); + ExtraInfo = GetMessageExtraInfo(); + MsgTime = GetMessageTime(); #ifdef DO_PRINT PrintThreadState(__LINE__, hWnd); @@ -232,6 +307,9 @@ static VOID DoTest_BUTTON(VOID) DO_CHECK(2, 0); DO_CHECK(3, hImeWnd); DO_CHECK(4, hIMC); + DO_CHECK(6, hCursor); + DO_CHECK(8, ExtraInfo); + DO_CHECK(10, MsgTime); DestroyWindow(hWnd); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs