Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [TASKMGR] Avoid hangs as much as possible (#4166)
by Katayama Hirofumi MZ 16 Dec '21

16 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=545e1190f2caf714ff897… commit 545e1190f2caf714ff897d909645adc04178e3a6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 16 09:57:40 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 16 09:57:40 2021 +0900 [TASKMGR] Avoid hangs as much as possible (#4166) - Use ShowWindowAsync instead of ShowWindow. - Use SwitchToThisWindow directly. CORE-17894 --- base/applications/taskmgr/applpage.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/base/applications/taskmgr/applpage.c b/base/applications/taskmgr/applpage.c index cf4c063f434..f3ad41c891a 100644 --- a/base/applications/taskmgr/applpage.c +++ b/base/applications/taskmgr/applpage.c @@ -5,6 +5,7 @@ * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * 2005 Klemens Friedl <frik85(a)reactos.at> + * 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,13 +58,6 @@ static HANDLE hApplicationThread = NULL; static DWORD dwApplicationThread; #endif -#if 0 -void SwitchToThisWindow ( -HWND hWnd, /* Handle to the window that should be activated */ -BOOL bRestore /* Restore the window if it is minimized */ -); -#endif - static INT GetSystemColorDepth(VOID) { @@ -785,7 +779,7 @@ void ApplicationPage_OnWindowsMinimize(void) if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { - ShowWindow(pAPLI->hWnd, SW_MINIMIZE); + ShowWindowAsync(pAPLI->hWnd, SW_MINIMIZE); } } } @@ -806,7 +800,7 @@ void ApplicationPage_OnWindowsMaximize(void) if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { - ShowWindow(pAPLI->hWnd, SW_MAXIMIZE); + ShowWindowAsync(pAPLI->hWnd, SW_MAXIMIZE); } } } @@ -859,9 +853,7 @@ void ApplicationPage_OnWindowsBringToFront(void) } } if (pAPLI) { - if (IsIconic(pAPLI->hWnd)) - ShowWindow(pAPLI->hWnd, SW_RESTORE); - BringWindowToTop(pAPLI->hWnd); + SwitchToThisWindow(pAPLI->hWnd, TRUE); } } @@ -884,21 +876,9 @@ void ApplicationPage_OnSwitchTo(void) } } if (pAPLI) { - typedef void (WINAPI *PROCSWITCHTOTHISWINDOW) (HWND, BOOL); - PROCSWITCHTOTHISWINDOW SwitchToThisWindow; - - HMODULE hUser32 = GetModuleHandleW(L"USER32"); - SwitchToThisWindow = (PROCSWITCHTOTHISWINDOW)GetProcAddress(hUser32, "SwitchToThisWindow"); - if (SwitchToThisWindow) { - SwitchToThisWindow(pAPLI->hWnd, TRUE); - } else { - if (IsIconic(pAPLI->hWnd)) - ShowWindow(pAPLI->hWnd, SW_RESTORE); - BringWindowToTop(pAPLI->hWnd); - SetForegroundWindow(pAPLI->hWnd); - } + SwitchToThisWindow(pAPLI->hWnd, TRUE); if (TaskManagerSettings.MinimizeOnUse) - ShowWindow(hMainWnd, SW_MINIMIZE); + ShowWindowAsync(hMainWnd, SW_MINIMIZE); } }

1 0

[reactos] 01/01: [NTUSER][USER32] Use async way in TileWindows and CascadeWindows (#4167)
by Katayama Hirofumi MZ 16 Dec '21

16 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b6f3eb8e4833ded0cfb2… commit 0b6f3eb8e4833ded0cfb2e1b0a1635ade6fa9224 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 16 09:52:02 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 16 09:52:02 2021 +0900 [NTUSER][USER32] Use async way in TileWindows and CascadeWindows (#4167) Processing asynchronously. CORE-17894 --- win32ss/include/ntuser.h | 2 +- win32ss/user/ntuser/winpos.c | 4 ++-- win32ss/user/user32/windows/mdi.c | 4 ++-- win32ss/user/user32/windows/window.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 38076513db2..339076b4984 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2129,7 +2129,7 @@ BOOL NTAPI NtUserEndDeferWindowPosEx( HDWP WinPosInfo, - DWORD Unknown1); + BOOL bAsync); BOOL NTAPI diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index da70805ed9c..4586d2357dc 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -3164,12 +3164,12 @@ NtUserChildWindowFromPointEx(HWND hwndParent, */ BOOL APIENTRY NtUserEndDeferWindowPosEx(HDWP WinPosInfo, - DWORD Unknown1) + BOOL bAsync) { BOOL Ret; TRACE("Enter NtUserEndDeferWindowPosEx\n"); UserEnterExclusive(); - Ret = IntEndDeferWindowPosEx(WinPosInfo, (BOOL)Unknown1); + Ret = IntEndDeferWindowPosEx(WinPosInfo, bAsync); TRACE("Leave NtUserEndDeferWindowPosEx, ret=%i\n", Ret); UserLeave(); return Ret; diff --git a/win32ss/user/user32/windows/mdi.c b/win32ss/user/user32/windows/mdi.c index c93e541b463..2849c0d6612 100644 --- a/win32ss/user/user32/windows/mdi.c +++ b/win32ss/user/user32/windows/mdi.c @@ -2190,7 +2190,7 @@ CascadeWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect, ++ret; } - EndDeferWindowPos(hDWP); + NtUserEndDeferWindowPosEx(hDWP, TRUE); if (hwndPrev) SetForegroundWindow(hwndPrev); @@ -2384,7 +2384,7 @@ TileWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect, ++ret; } - EndDeferWindowPos(hDWP); + NtUserEndDeferWindowPosEx(hDWP, TRUE); if (hwndPrev) SetForegroundWindow(hwndPrev); diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 8aa237ba397..cf7f5c9ccc0 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -645,7 +645,7 @@ DeferWindowPos(HDWP hWinPosInfo, BOOL WINAPI EndDeferWindowPos(HDWP hWinPosInfo) { - return NtUserEndDeferWindowPosEx(hWinPosInfo, 0); + return NtUserEndDeferWindowPosEx(hWinPosInfo, FALSE); }

1 0

[reactos] 01/01: [EXPLORER] Quick taskbar menu even if any halted window (#4165)
by Katayama Hirofumi MZ 16 Dec '21

16 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f636b96eeedddf3e7e37d… commit f636b96eeedddf3e7e37d59e2731f74e88cba221 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 16 09:49:43 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 16 09:49:43 2021 +0900 [EXPLORER] Quick taskbar menu even if any halted window (#4165) Optimized for speed. CORE-17894 --- base/shell/explorer/taskswnd.cpp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index d6e6d2a97ac..caa725fc14e 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -488,27 +488,34 @@ public: HICON GetWndIcon(HWND hwnd) { - HICON hIcon = 0; + HICON hIcon = NULL; +#define GET_ICON(type) \ + SendMessageTimeout(hwnd, WM_GETICON, (type), 0, SMTO_ABORTIFHUNG, 100, (PDWORD_PTR)&hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) &hIcon); + LRESULT bAlive = GET_ICON(ICON_SMALL2); if (hIcon) return hIcon; - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) &hIcon); - if (hIcon) - return hIcon; + if (bAlive) + { + bAlive = GET_ICON(ICON_SMALL); + if (hIcon) + return hIcon; + } - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) &hIcon); - if (hIcon) - return hIcon; + if (bAlive) + { + GET_ICON(ICON_BIG); + if (hIcon) + return hIcon; + } +#undef GET_ICON - hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICONSM); + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); if (hIcon) return hIcon; - hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICON); - - return hIcon; + return (HICON)GetClassLongPtr(hwnd, GCL_HICON); } INT UpdateTaskItemButton(IN PTASK_ITEM TaskItem)

1 0

[reactos] 02/02: [TASKMGR] Preserve graphs history on resizes (#4141)
by Valerij Zaporogeci 16 Dec '21

16 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=403222dd4f73836b38c11… commit 403222dd4f73836b38c11a42fa6c3fc1614681d7 Author: Valerij Zaporogeci <vlrzprgts(a)gmail.com> AuthorDate: Mon Dec 6 04:49:42 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Dec 16 03:06:09 2021 +0300 [TASKMGR] Preserve graphs history on resizes (#4141) - Also the graph stays preserved on the kernel time toggle - An attempt to clean up the collected cruft was made as well --- base/applications/taskmgr/graphctl.c | 781 ++++++++++++----------------------- base/applications/taskmgr/graphctl.h | 118 ++---- base/applications/taskmgr/perfpage.c | 78 ++-- 3 files changed, 338 insertions(+), 639 deletions(-) diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index de60958ef02..0d15f4d61d8 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -12,582 +12,294 @@ WNDPROC OldGraphCtrlWndProc; -static void GraphCtrl_Init(TGraphCtrl* this) +BOOL +GraphCtrl_Create(PTM_GRAPH_CONTROL inst, HWND hWnd, HWND hParentWnd, PTM_FORMAT fmt) { - int i; - - this->m_hWnd = 0; - this->m_hParentWnd = 0; - this->m_dcGrid = 0; - this->m_dcPlot = 0; - this->m_bitmapOldGrid = 0; - this->m_bitmapOldPlot = 0; - this->m_bitmapGrid = 0; - this->m_bitmapPlot = 0; - this->m_brushBack = 0; - - this->m_penPlot[0] = 0; - this->m_penPlot[1] = 0; - this->m_penPlot[2] = 0; - this->m_penPlot[3] = 0; - - /* since plotting is based on a LineTo for each new point - * we need a starting point (i.e. a "previous" point) - * use 0.0 as the default first point. - * these are public member variables, and can be changed outside - * (after construction). Therefore m_perviousPosition could be set to - * a more appropriate value prior to the first call to SetPosition. - */ - this->m_dPreviousPosition[0] = 0.0; - this->m_dPreviousPosition[1] = 0.0; - this->m_dPreviousPosition[2] = 0.0; - this->m_dPreviousPosition[3] = 0.0; - - /* public variable for the number of decimal places on the y axis */ - this->m_nYDecimals = 3; - - /* set some initial values for the scaling until "SetRange" is called. - * these are protected variables and must be set with SetRange - * in order to ensure that m_dRange is updated accordingly - */ - /* m_dLowerLimit = -10.0; */ - /* m_dUpperLimit = 10.0; */ - this->m_dLowerLimit = 0.0; - this->m_dUpperLimit = 100.0; - this->m_dRange = this->m_dUpperLimit - this->m_dLowerLimit; /* protected member variable */ - - /* m_nShiftPixels determines how much the plot shifts (in terms of pixels) */ - /* with the addition of a new data point */ - this->m_nShiftPixels = 4; - this->m_nHalfShiftPixels = this->m_nShiftPixels / 2; /* protected */ - this->m_nPlotShiftPixels = this->m_nShiftPixels + this->m_nHalfShiftPixels; /* protected */ - - /* Set how big the grid boxes are */ - this->m_nGridXPixels = 12; - this->m_nGridYPixels = 12; - - /* Task manager should scroll grid with the graph. This variable contains the */ - /* amount of pixels the grid paint origin should shift to left */ - this->m_nGridOffsetPixels = 0; - - /* background, grid and data colors */ - /* these are public variables and can be set directly */ - this->m_crBackColor = RGB( 0, 0, 0); /* see also SetBackgroundColor */ - this->m_crGridColor = RGB( 0, 128, 64); /* see also SetGridColor */ - this->m_crPlotColor[0] = RGB(255, 255, 255); /* see also SetPlotColor */ - this->m_crPlotColor[1] = RGB(100, 255, 255); /* see also SetPlotColor */ - this->m_crPlotColor[2] = RGB(255, 100, 255); /* see also SetPlotColor */ - this->m_crPlotColor[3] = RGB(255, 255, 100); /* see also SetPlotColor */ - - /* protected variables */ - for (i = 0; i < MAX_PLOTS; i++) + HDC hdc, hdcg; + HBITMAP hbmOld; + UINT Size; + INT p; + RECT rc; + + inst->hParentWnd = hParentWnd; + inst->hWnd = hWnd; + + Size = GetSystemMetrics(SM_CXSCREEN); + inst->BitmapWidth = Size; + Size /= PLOT_SHIFT; + inst->PointBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size * NUM_PLOTS); + if (!inst->PointBuffer) { - this->m_penPlot[i] = CreatePen(PS_SOLID, 0, this->m_crPlotColor[i]); + goto fail; } - this->m_brushBack = CreateSolidBrush(this->m_crBackColor); - /* public member variables, can be set directly */ - strcpy(this->m_strXUnitsString, "Samples"); /* can also be set with SetXUnits */ - strcpy(this->m_strYUnitsString, "Y units"); /* can also be set with SetYUnits */ + inst->NumberOfPoints = Size; + inst->CurrIndex = 0; - /* protected bitmaps to restore the memory DC's */ - this->m_bitmapOldGrid = NULL; - this->m_bitmapOldPlot = NULL; -} + /* Styling */ + inst->hPenGrid = CreatePen(PS_SOLID, 0, fmt->clrGrid); + inst->hPen0 = CreatePen(PS_SOLID, 0, fmt->clrPlot0); + inst->hPen1 = CreatePen(PS_SOLID, 0, fmt->clrPlot1); + inst->hBrushBack = CreateSolidBrush(fmt->clrBack); -void GraphCtrl_Dispose(TGraphCtrl* this) -{ - int plot; + if (!inst->hPenGrid || + !inst->hPen0 || + !inst->hPen1 || + !inst->hBrushBack) + { + goto fail; + } - for (plot = 0; plot < MAX_PLOTS; plot++) - DeleteObject(this->m_penPlot[plot]); + if (fmt->GridCellWidth >= PLOT_SHIFT << 2) + inst->GridCellWidth = fmt->GridCellWidth; + else + inst->GridCellWidth = PLOT_SHIFT << 2; + if (fmt->GridCellHeight >= PLOT_SHIFT << 2) + inst->GridCellHeight = fmt->GridCellHeight; + else + inst->GridCellHeight = PLOT_SHIFT << 2; + + inst->DrawSecondaryPlot = fmt->DrawSecondaryPlot; + + GetClientRect(hWnd, &rc); + inst->BitmapHeight = rc.bottom; + inst->ftPixelsPerPercent = (FLOAT)(inst->BitmapHeight) / 100.00f; + + hdc = GetDC(hParentWnd); + hdcg = CreateCompatibleDC(hdc); + inst->hdcGraph = hdcg; + inst->hbmGraph = CreateCompatibleBitmap(hdc, inst->BitmapWidth, inst->BitmapHeight); + + if (!hdc || + !hdcg || + !inst->hbmGraph) + { + goto fail; + } - /* just to be picky restore the bitmaps for the two memory dc's */ - /* (these dc's are being destroyed so there shouldn't be any leaks) */ + ReleaseDC(hParentWnd, hdc); + hbmOld = (HBITMAP)SelectObject(hdcg, inst->hbmGraph); + DeleteObject(hbmOld); - if (this->m_bitmapOldGrid != NULL) SelectObject(this->m_dcGrid, this->m_bitmapOldGrid); - if (this->m_bitmapOldPlot != NULL) SelectObject(this->m_dcPlot, this->m_bitmapOldPlot); - if (this->m_bitmapGrid != NULL) DeleteObject(this->m_bitmapGrid); - if (this->m_bitmapPlot != NULL) DeleteObject(this->m_bitmapPlot); - if (this->m_dcGrid != NULL) DeleteDC(this->m_dcGrid); - if (this->m_dcPlot != NULL) DeleteDC(this->m_dcPlot); - if (this->m_brushBack != NULL) DeleteObject(this->m_brushBack); -} + SetBkColor(hdcg, fmt->clrBack); + rc.right = inst->BitmapWidth; + FillRect(hdcg, &rc, inst->hBrushBack); -void GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, UINT nID) -{ - GraphCtrl_Init(this); - this->m_hParentWnd = hParentWnd; - this->m_hWnd = hWnd; + inst->CurrShift = 0; + SelectObject(hdcg, inst->hPenGrid); + for (p = inst->GridCellHeight - 1; + p < inst->BitmapHeight; + p += inst->GridCellHeight) + { + MoveToEx(hdcg, 0, p, NULL); + LineTo(hdcg, inst->BitmapWidth, p); + } + for (p = inst->BitmapWidth - 1; + p > 0; + p -= inst->GridCellWidth) + { + MoveToEx(hdcg, p, 0, NULL); + LineTo(hdcg, p, inst->BitmapHeight); + } + SelectObject(hdcg, inst->hPen0); - GraphCtrl_Resize(this); + return TRUE; - return; +fail: + GraphCtrl_Dispose(inst); + return FALSE; } -void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double dUpper, int nDecimalPlaces) +void +GraphCtrl_Dispose(PTM_GRAPH_CONTROL inst) { - /* ASSERT(dUpper > dLower); */ - this->m_dLowerLimit = dLower; - this->m_dUpperLimit = dUpper; - this->m_nYDecimals = nDecimalPlaces; - this->m_dRange = this->m_dUpperLimit - this->m_dLowerLimit; - this->m_dVerticalFactor = (double)this->m_nPlotHeight / this->m_dRange; - /* clear out the existing garbage, re-start with a clean plot */ - GraphCtrl_InvalidateCtrl(this, FALSE); -} + if (inst->PointBuffer) + HeapFree(GetProcessHeap(), 0, inst->PointBuffer); -#if 0 -void TGraphCtrl::SetXUnits(const char* string) -{ - strncpy(m_strXUnitsString, string, sizeof(m_strXUnitsString) - 1); - /* clear out the existing garbage, re-start with a clean plot */ - InvalidateCtrl(); -} + if (inst->hPenGrid) + DeleteObject(inst->hPenGrid); -void TGraphCtrl::SetYUnits(const char* string) -{ - strncpy(m_strYUnitsString, string, sizeof(m_strYUnitsString) - 1); - /* clear out the existing garbage, re-start with a clean plot */ - InvalidateCtrl(); -} -#endif + if (inst->hPen0) + DeleteObject(inst->hPen0); -void GraphCtrl_SetGridColor(TGraphCtrl* this, COLORREF color) -{ - this->m_crGridColor = color; - /* clear out the existing garbage, re-start with a clean plot */ - GraphCtrl_InvalidateCtrl(this, FALSE); -} + if (inst->hPen1) + DeleteObject(inst->hPen1); -void GraphCtrl_SetPlotColor(TGraphCtrl* this, int plot, COLORREF color) -{ - this->m_crPlotColor[plot] = color; - DeleteObject(this->m_penPlot[plot]); - this->m_penPlot[plot] = CreatePen(PS_SOLID, 0, this->m_crPlotColor[plot]); - /* clear out the existing garbage, re-start with a clean plot */ - GraphCtrl_InvalidateCtrl(this, FALSE); -} + if (inst->hBrushBack) + DeleteObject(inst->hBrushBack); -void GraphCtrl_SetBackgroundColor(TGraphCtrl* this, COLORREF color) -{ - this->m_crBackColor = color; - DeleteObject(this->m_brushBack); - this->m_brushBack = CreateSolidBrush(this->m_crBackColor); - /* clear out the existing garbage, re-start with a clean plot */ - GraphCtrl_InvalidateCtrl(this, FALSE); + if (inst->hbmGraph) + DeleteObject(inst->hbmGraph); + + if (inst->hdcGraph) + DeleteObject(inst->hdcGraph); } -void GraphCtrl_InvalidateCtrl(TGraphCtrl* this, BOOL bResize) +void +GraphCtrl_AddPoint(PTM_GRAPH_CONTROL inst, BYTE val0, BYTE val1) { - /* There is a lot of drawing going on here - particularly in terms of */ - /* drawing the grid. Don't panic, this is all being drawn (only once) */ - /* to a bitmap. The result is then BitBlt'd to the control whenever needed. */ - int i; - int nCharacters; - //int nTopGridPix, nMidGridPix, nBottomGridPix; - - HPEN oldPen; - HPEN solidPen = CreatePen(PS_SOLID, 0, this->m_crGridColor); - /* HFONT axisFont, yUnitFont, oldFont; */ - /* char strTemp[50]; */ - - /* in case we haven't established the memory dc's */ - /* CClientDC dc(this); */ - HDC dc = GetDC(this->m_hParentWnd); - - /* if we don't have one yet, set up a memory dc for the grid */ - if (this->m_dcGrid == NULL) + HDC hdcg; + PBYTE t; + RECT rcDirt; + + UINT Prev0, Prev1, RetainingWidth; + INT PrevY, CurrY, p, v; + + hdcg = inst->hdcGraph; + RetainingWidth = inst->BitmapWidth - PLOT_SHIFT; + t = inst->PointBuffer; + Prev0 = *(t + inst->CurrIndex); + Prev1 = *(t + inst->CurrIndex + inst->NumberOfPoints); + if (inst->CurrIndex < inst->NumberOfPoints) { - this->m_dcGrid = CreateCompatibleDC(dc); - this->m_bitmapGrid = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); - this->m_bitmapOldGrid = (HBITMAP)SelectObject(this->m_dcGrid, this->m_bitmapGrid); + inst->CurrIndex++; } - else if(bResize) + else { - // the size of the drawing area has changed - // so create a new bitmap of the appropriate size - if(this->m_bitmapGrid != NULL) - { - this->m_bitmapGrid = (HBITMAP)SelectObject(this->m_dcGrid, this->m_bitmapOldGrid); - DeleteObject(this->m_bitmapGrid); - this->m_bitmapGrid = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); - SelectObject(this->m_dcGrid, this->m_bitmapGrid); - } + inst->CurrIndex = 0; } - - SetBkColor(this->m_dcGrid, this->m_crBackColor); - - /* fill the grid background */ - FillRect(this->m_dcGrid, &this->m_rectClient, this->m_brushBack); - - /* draw the plot rectangle: */ - /* determine how wide the y axis scaling values are */ - nCharacters = abs((int)log10(fabs(this->m_dUpperLimit))); - nCharacters = max(nCharacters, abs((int)log10(fabs(this->m_dLowerLimit)))); - - /* add the units digit, decimal point and a minus sign, and an extra space */ - /* as well as the number of decimal places to display */ - nCharacters = nCharacters + 4 + this->m_nYDecimals; - - /* adjust the plot rectangle dimensions */ - /* assume 6 pixels per character (this may need to be adjusted) */ - /* m_rectPlot.left = m_rectClient.left + 6*(nCharacters); */ - this->m_rectPlot.left = this->m_rectClient.left; - this->m_nPlotWidth = this->m_rectPlot.right - this->m_rectPlot.left;/* m_rectPlot.Width(); */ - - /* draw the plot rectangle */ - oldPen = (HPEN)SelectObject(this->m_dcGrid, solidPen); - MoveToEx(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.top, NULL); - LineTo(this->m_dcGrid, this->m_rectPlot.right + 1, this->m_rectPlot.top); - LineTo(this->m_dcGrid, this->m_rectPlot.right + 1, this->m_rectPlot.bottom + 1); - LineTo(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.bottom + 1); - /* LineTo(m_dcGrid, m_rectPlot.left, m_rectPlot.top); */ - - /* draw the horizontal axis */ - for (i = this->m_rectPlot.top; i <= this->m_rectPlot.bottom; i += this->m_nGridYPixels) + *(t + inst->CurrIndex) = val0; + *(t + inst->CurrIndex + inst->NumberOfPoints) = val1; + + /* Drawing points, first shifting the plot left */ + BitBlt(hdcg, 0, 0, RetainingWidth, inst->BitmapHeight, hdcg, PLOT_SHIFT, 0, SRCCOPY); + + rcDirt.left = RetainingWidth; + rcDirt.top = 0; + rcDirt.right = inst->BitmapWidth; + rcDirt.bottom = inst->BitmapHeight; + FillRect(hdcg, &rcDirt, inst->hBrushBack); + + SelectObject(hdcg, inst->hPenGrid); + for (p = inst->GridCellHeight - 1; + p < inst->BitmapHeight; + p += inst->GridCellHeight) { - MoveToEx(this->m_dcGrid, this->m_rectPlot.left, i, NULL); - LineTo(this->m_dcGrid, this->m_rectPlot.right, i); + MoveToEx(hdcg, RetainingWidth, p, NULL); + LineTo(hdcg, inst->BitmapWidth, p); } - - /* draw the vertical axis */ - /* In order to keep grid position uniform when resizing, vertical axis should be */ - /* drawn from right to left */ - for (i = this->m_rectPlot.right - this->m_nGridOffsetPixels; i >= this->m_rectPlot.left; i -= this->m_nGridXPixels) + v = inst->CurrShift + PLOT_SHIFT; + if (v >= inst->GridCellWidth) { - MoveToEx(this->m_dcGrid, i, this->m_rectPlot.bottom, NULL); - LineTo(this->m_dcGrid, i, this->m_rectPlot.top); + v -= inst->GridCellWidth; + p = inst->BitmapWidth - v - 1; + MoveToEx(hdcg, p, 0, NULL); + LineTo(hdcg, p, inst->BitmapHeight); } + inst->CurrShift = v; - SelectObject(this->m_dcGrid, oldPen); - DeleteObject(solidPen); - -#if 0 - /* create some fonts (horizontal and vertical) */ - /* use a height of 14 pixels and 300 weight */ - /* (these may need to be adjusted depending on the display) */ - axisFont = CreateFont (14, 0, 0, 0, 300, - FALSE, FALSE, 0, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - DEFAULT_PITCH|FF_SWISS, "Arial"); - yUnitFont = CreateFont (14, 0, 900, 0, 300, - FALSE, FALSE, 0, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - DEFAULT_PITCH|FF_SWISS, "Arial"); - - /* grab the horizontal font */ - oldFont = (HFONT)SelectObject(m_dcGrid, axisFont); - - /* y max */ - SetTextColor(m_dcGrid, m_crGridColor); - SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); - sprintf(strTemp, "%.*lf", m_nYDecimals, m_dUpperLimit); - TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.top, strTemp, wcslen(strTemp)); - - /* y min */ - SetTextAlign(m_dcGrid, TA_RIGHT|TA_BASELINE); - sprintf(strTemp, "%.*lf", m_nYDecimals, m_dLowerLimit); - TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.bottom, strTemp, wcslen(strTemp)); - - /* x min */ - SetTextAlign(m_dcGrid, TA_LEFT|TA_TOP); - TextOut(m_dcGrid, m_rectPlot.left, m_rectPlot.bottom+4, "0", 1); - - /* x max */ - SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); - sprintf(strTemp, "%d", m_nPlotWidth/m_nShiftPixels); - TextOut(m_dcGrid, m_rectPlot.right, m_rectPlot.bottom+4, strTemp, wcslen(strTemp)); - - /* x units */ - SetTextAlign(m_dcGrid, TA_CENTER|TA_TOP); - TextOut(m_dcGrid, (m_rectPlot.left+m_rectPlot.right)/2, - m_rectPlot.bottom+4, m_strXUnitsString, wcslen(m_strXUnitsString)); - - /* restore the font */ - SelectObject(m_dcGrid, oldFont); - - /* y units */ - oldFont = (HFONT)SelectObject(m_dcGrid, yUnitFont); - SetTextAlign(m_dcGrid, TA_CENTER|TA_BASELINE); - TextOut(m_dcGrid, (m_rectClient.left+m_rectPlot.left)/2, - (m_rectPlot.bottom+m_rectPlot.top)/2, m_strYUnitsString, wcslen(m_strYUnitsString)); - SelectObject(m_dcGrid, oldFont); -#endif - /* at this point we are done filling the grid bitmap, */ - /* no more drawing to this bitmap is needed until the settings are changed */ - - /* if we don't have one yet, set up a memory dc for the plot */ - if (this->m_dcPlot == NULL) - { - this->m_dcPlot = CreateCompatibleDC(dc); - this->m_bitmapPlot = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); - this->m_bitmapOldPlot = (HBITMAP)SelectObject(this->m_dcPlot, this->m_bitmapPlot); - } - else if(bResize) + if (inst->DrawSecondaryPlot) { - // the size of the drawing area has changed - // so create a new bitmap of the appropriate size - if(this->m_bitmapPlot != NULL) - { - this->m_bitmapPlot = (HBITMAP)SelectObject(this->m_dcPlot, this->m_bitmapOldPlot); - DeleteObject(this->m_bitmapPlot); - this->m_bitmapPlot = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); - SelectObject(this->m_dcPlot, this->m_bitmapPlot); - GraphCtrl_DrawPoint(this); - } - } - - /* make sure the plot bitmap is cleared */ - SetBkColor(this->m_dcPlot, this->m_crBackColor); - FillRect(this->m_dcPlot, &this->m_rectClient, this->m_brushBack); + SelectObject(inst->hdcGraph, inst->hPen1); - /* finally, force the plot area to redraw */ - InvalidateRect(this->m_hParentWnd, &this->m_rectClient, TRUE); - ReleaseDC(this->m_hParentWnd, dc); -} + PrevY = inst->BitmapHeight - Prev1 * inst->ftPixelsPerPercent; + MoveToEx(inst->hdcGraph, RetainingWidth - 1, PrevY, NULL); + CurrY = inst->BitmapHeight - val1 * inst->ftPixelsPerPercent; + LineTo(inst->hdcGraph, inst->BitmapWidth - 1, CurrY); + } -double GraphCtrl_AppendPoint(TGraphCtrl* this, - double dNewPoint0, double dNewPoint1, - double dNewPoint2, double dNewPoint3) -{ - /* append a data point to the plot & return the previous point */ - double dPrevious; - - dPrevious = this->m_dCurrentPosition[0]; - this->m_dCurrentPosition[0] = dNewPoint0; - this->m_dCurrentPosition[1] = dNewPoint1; - this->m_dCurrentPosition[2] = dNewPoint2; - this->m_dCurrentPosition[3] = dNewPoint3; - GraphCtrl_ShiftGrid(this); - GraphCtrl_DrawPoint(this); - /* Invalidate(); */ - return dPrevious; + SelectObject(inst->hdcGraph, inst->hPen0); + PrevY = inst->BitmapHeight - Prev0 * inst->ftPixelsPerPercent; + MoveToEx(inst->hdcGraph, RetainingWidth - 1, PrevY, NULL); + CurrY = inst->BitmapHeight - val0 * inst->ftPixelsPerPercent; + LineTo(inst->hdcGraph, inst->BitmapWidth - 1, CurrY); } -void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) +inline void +GraphCtrl_RedrawBitmap(PTM_GRAPH_CONTROL inst, INT h) { - HDC memDC; - HBITMAP memBitmap; - HBITMAP oldBitmap; /* bitmap originally found in CMemDC */ - -/* RECT rcClient; */ -/* GetClientRect(hWnd, &rcClient); */ -/* FillSolidRect(dc, &rcClient, RGB(255, 0, 255)); */ -/* m_nClientWidth = rcClient.right - rcClient.left; */ -/* m_nClientHeight = rcClient.bottom - rcClient.top; */ - - /* no real plotting work is performed here, */ - /* just putting the existing bitmaps on the client */ - - /* to avoid flicker, establish a memory dc, draw to it */ - /* and then BitBlt it to the client */ - memDC = CreateCompatibleDC(dc); - memBitmap = (HBITMAP)CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); - oldBitmap = (HBITMAP)SelectObject(memDC, memBitmap); - - if (memDC != NULL) + HDC hdcg; + PBYTE t; + RECT rc; + INT i, j, y, x, p; + FLOAT coef; + + hdcg = inst->hdcGraph; + rc.left = 0; rc.top = 0; + rc.right = inst->BitmapWidth; rc.bottom = h; + FillRect(hdcg, &rc, inst->hBrushBack); + + SelectObject(hdcg, inst->hPenGrid); + + for (p = inst->GridCellHeight - 1; + p < inst->BitmapHeight; + p += inst->GridCellHeight) { - /* first drop the grid on the memory dc */ - BitBlt(memDC, 0, 0, this->m_nClientWidth, this->m_nClientHeight, this->m_dcGrid, 0, 0, SRCCOPY); - /* now add the plot on top as a "pattern" via SRCPAINT. */ - /* works well with dark background and a light plot */ - BitBlt(memDC, 0, 0, this->m_nClientWidth, this->m_nClientHeight, this->m_dcPlot, 0, 0, SRCPAINT); /* SRCPAINT */ - /* finally send the result to the display */ - BitBlt(dc, 0, 0, this->m_nClientWidth, this->m_nClientHeight, memDC, 0, 0, SRCCOPY); + MoveToEx(hdcg, 0, p, NULL); + LineTo(hdcg, inst->BitmapWidth, p); } - SelectObject(memDC, oldBitmap); - DeleteObject(memBitmap); - DeleteDC(memDC); -} - -void GraphCtrl_ShiftGrid(TGraphCtrl* this) -{ - RECT rectCleanUp; - HPEN oldPen, solidPen; - int i; - - if (this->m_dcGrid == NULL) - return; - - solidPen = CreatePen(PS_SOLID, 0, this->m_crGridColor); - - /* Scroll the grid left: BitBlt it to itself */ - BitBlt(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.top + 1, - this->m_nPlotWidth, this->m_nPlotHeight, - this->m_dcGrid, this->m_rectPlot.left + this->m_nShiftPixels, this->m_rectPlot.top + 1, - SRCCOPY); - - /* Set shift pixels */ - this->m_nGridOffsetPixels = (this->m_nGridOffsetPixels + this->m_nShiftPixels) % this->m_nGridXPixels; - - /* Construct a rect in which needs update */ - rectCleanUp = this->m_rectPlot; - rectCleanUp.left = rectCleanUp.right - this->m_nShiftPixels; - /* Fill the cleanup area with the background */ - FillRect(this->m_dcGrid, &rectCleanUp, this->m_brushBack); - - /* Draw the plot rectangle */ - oldPen = (HPEN)SelectObject(this->m_dcGrid, solidPen); - - /* Redraw horizontal axis */ - for (i = rectCleanUp.top; i < rectCleanUp.bottom; i += this->m_nGridYPixels) + for (p = inst->BitmapWidth - inst->CurrShift - 1; + p > 0; + p -= inst->GridCellWidth) { - MoveToEx(this->m_dcGrid, rectCleanUp.left, i, NULL); - LineTo(this->m_dcGrid, rectCleanUp.right, i); + MoveToEx(hdcg, p, 0, NULL); + LineTo(hdcg, p, inst->BitmapHeight); } - /* Redraw scrolled vertical axis */ - MoveToEx(this->m_dcGrid, rectCleanUp.right - this->m_nGridOffsetPixels, rectCleanUp.top, NULL); - LineTo(this->m_dcGrid, rectCleanUp.right - this->m_nGridOffsetPixels, rectCleanUp.bottom); - - SelectObject(this->m_dcGrid, oldPen); - DeleteObject(solidPen); -} + coef = inst->ftPixelsPerPercent; -void GraphCtrl_DrawPoint(TGraphCtrl* this) -{ - /* this does the work of "scrolling" the plot to the left - * and appending a new data point all of the plotting is - * directed to the memory based bitmap associated with m_dcPlot - * the will subsequently be BitBlt'd to the client in Paint - */ - int currX, prevX, currY, prevY; - HPEN oldPen; - RECT rectCleanUp; - int i; - - if (this->m_dcPlot != NULL) + if (inst->DrawSecondaryPlot) { - /* shift the plot by BitBlt'ing it to itself - * note: the m_dcPlot covers the entire client - * but we only shift bitmap that is the size - * of the plot rectangle - * grab the right side of the plot (excluding m_nShiftPixels on the left) - * move this grabbed bitmap to the left by m_nShiftPixels - */ - BitBlt(this->m_dcPlot, this->m_rectPlot.left, this->m_rectPlot.top + 1, - this->m_nPlotWidth, this->m_nPlotHeight, this->m_dcPlot, - this->m_rectPlot.left+this->m_nShiftPixels, this->m_rectPlot.top + 1, - SRCCOPY); - - /* establish a rectangle over the right side of plot */ - /* which now needs to be cleaned up prior to adding the new point */ - rectCleanUp = this->m_rectPlot; - rectCleanUp.left = rectCleanUp.right - this->m_nShiftPixels; - - /* fill the cleanup area with the background */ - FillRect(this->m_dcPlot, &rectCleanUp, this->m_brushBack); - - /* draw the next line segment */ - for (i = 0; i < MAX_PLOTS; i++) + SelectObject(hdcg, inst->hPen1); + t = inst->PointBuffer + inst->NumberOfPoints; + x = inst->BitmapWidth - 1; + j = inst->CurrIndex; + y = h - *(t + j) * coef; + MoveToEx(hdcg, x, y, NULL); + for (i = 0; i < inst->NumberOfPoints; i++) { - /* grab the plotting pen */ - oldPen = (HPEN)SelectObject(this->m_dcPlot, this->m_penPlot[i]); - - /* move to the previous point */ - prevX = this->m_rectPlot.right-this->m_nPlotShiftPixels; - prevY = this->m_rectPlot.bottom - - (long)((this->m_dPreviousPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); - MoveToEx(this->m_dcPlot, prevX, prevY, NULL); - - /* draw to the current point */ - currX = this->m_rectPlot.right-this->m_nHalfShiftPixels; - currY = this->m_rectPlot.bottom - - (long)((this->m_dCurrentPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); - LineTo(this->m_dcPlot, currX, currY); - - /* Restore the pen */ - SelectObject(this->m_dcPlot, oldPen); - - /* if the data leaks over the upper or lower plot boundaries - * fill the upper and lower leakage with the background - * this will facilitate clipping on an as needed basis - * as opposed to always calling IntersectClipRect - */ - if ((prevY <= this->m_rectPlot.top) || (currY <= this->m_rectPlot.top)) - { - RECT rc; - rc.bottom = this->m_rectPlot.top + 1; - rc.left = prevX; - rc.right = currX + 1; - rc.top = this->m_rectClient.top; - FillRect(this->m_dcPlot, &rc, this->m_brushBack); - } - if ((prevY >= this->m_rectPlot.bottom) || (currY >= this->m_rectPlot.bottom)) - { - RECT rc; - rc.bottom = this->m_rectClient.bottom + 1; - rc.left = prevX; - rc.right = currX + 1; - rc.top = this->m_rectPlot.bottom + 1; - /* RECT rc(prevX, m_rectPlot.bottom+1, currX+1, m_rectClient.bottom+1); */ - FillRect(this->m_dcPlot, &rc, this->m_brushBack); - } - - /* store the current point for connection to the next point */ - this->m_dPreviousPosition[i] = this->m_dCurrentPosition[i]; + j = (j ? j : inst->NumberOfPoints) - 1; + y = h - *(t + j) * coef; + x -= PLOT_SHIFT; + LineTo(hdcg, x, y); } } -} -void GraphCtrl_Resize(TGraphCtrl* this) -{ - /* NOTE: Resize automatically gets called during the setup of the control */ - GetClientRect(this->m_hWnd, &this->m_rectClient); - - /* set some member variables to avoid multiple function calls */ - this->m_nClientHeight = this->m_rectClient.bottom - this->m_rectClient.top;/* m_rectClient.Height(); */ - this->m_nClientWidth = this->m_rectClient.right - this->m_rectClient.left;/* m_rectClient.Width(); */ - - /* the "left" coordinate and "width" will be modified in */ - /* InvalidateCtrl to be based on the width of the y axis scaling */ -#if 0 - this->m_rectPlot.left = 20; - this->m_rectPlot.top = 10; - this->m_rectPlot.right = this->m_rectClient.right-10; - this->m_rectPlot.bottom = this->m_rectClient.bottom-25; -#else - this->m_rectPlot.left = 0; - this->m_rectPlot.top = -1; - this->m_rectPlot.right = this->m_rectClient.right; - this->m_rectPlot.bottom = this->m_rectClient.bottom; -#endif - - /* set some member variables to avoid multiple function calls */ - this->m_nPlotHeight = this->m_rectPlot.bottom - this->m_rectPlot.top;/* m_rectPlot.Height(); */ - this->m_nPlotWidth = this->m_rectPlot.right - this->m_rectPlot.left;/* m_rectPlot.Width(); */ - - /* set the scaling factor for now, this can be adjusted */ - /* in the SetRange functions */ - this->m_dVerticalFactor = (double)this->m_nPlotHeight / this->m_dRange; + SelectObject(hdcg, inst->hPen0); + t = inst->PointBuffer; + x = inst->BitmapWidth - 1; + j = inst->CurrIndex; + y = h - *(t + j) * coef; + MoveToEx(hdcg, x, y, NULL); + + for (i = 0; i < inst->NumberOfPoints; i++) + { + j = (j ? j : inst->NumberOfPoints) - 1; + y = h - *(t + j) * coef; + x -= PLOT_SHIFT; + LineTo(hdcg, x, y); + } } -#if 0 -void TGraphCtrl::Reset() +inline void +GraphCtrl_RedrawOnHeightChange(PTM_GRAPH_CONTROL inst, INT nh) { - /* to clear the existing data (in the form of a bitmap) */ - /* simply invalidate the entire control */ - InvalidateCtrl(); + HDC hdc; + HBITMAP hbmOld; + + inst->BitmapHeight = nh; + inst->ftPixelsPerPercent = (FLOAT)nh / 100.00f; + + hdc = GetDC(inst->hParentWnd); + hbmOld = inst->hbmGraph; + inst->hbmGraph = CreateCompatibleBitmap(hdc, inst->BitmapWidth, nh); + SelectObject(inst->hdcGraph, inst->hbmGraph); + DeleteObject(hbmOld); + ReleaseDC(inst->hParentWnd, hdc); + + GraphCtrl_RedrawBitmap(inst, nh); } -#endif -extern TGraphCtrl PerformancePageCpuUsageHistoryGraph; -extern TGraphCtrl PerformancePageMemUsageHistoryGraph; +extern TM_GRAPH_CONTROL PerformancePageCpuUsageHistoryGraph; +extern TM_GRAPH_CONTROL PerformancePageMemUsageHistoryGraph; extern HWND hPerformancePageCpuUsageHistoryGraph; extern HWND hPerformancePageMemUsageHistoryGraph; INT_PTR CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - RECT rcClient; - HDC hdc; - PAINTSTRUCT ps; + PTM_GRAPH_CONTROL graph; switch (message) { @@ -652,27 +364,44 @@ GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_SIZE: { - if (hWnd == hPerformancePageMemUsageHistoryGraph) - { - GraphCtrl_Resize(&PerformancePageMemUsageHistoryGraph); - GraphCtrl_InvalidateCtrl(&PerformancePageMemUsageHistoryGraph, TRUE); - } if (hWnd == hPerformancePageCpuUsageHistoryGraph) + graph = &PerformancePageCpuUsageHistoryGraph; + else if (hWnd == hPerformancePageMemUsageHistoryGraph) + graph = &PerformancePageMemUsageHistoryGraph; + else + return 0; + + if (HIWORD(lParam) != graph->BitmapHeight) { - GraphCtrl_Resize(&PerformancePageCpuUsageHistoryGraph); - GraphCtrl_InvalidateCtrl(&PerformancePageCpuUsageHistoryGraph, TRUE); + GraphCtrl_RedrawOnHeightChange(graph, HIWORD(lParam)); } + InvalidateRect(hWnd, NULL, FALSE); + return 0; } case WM_PAINT: { + RECT rcClient; + HDC hdc; + PAINTSTRUCT ps; + + if (hWnd == hPerformancePageCpuUsageHistoryGraph) + graph = &PerformancePageCpuUsageHistoryGraph; + else if (hWnd == hPerformancePageMemUsageHistoryGraph) + graph = &PerformancePageMemUsageHistoryGraph; + else + return 0; + hdc = BeginPaint(hWnd, &ps); GetClientRect(hWnd, &rcClient); - if (hWnd == hPerformancePageMemUsageHistoryGraph) - GraphCtrl_Paint(&PerformancePageMemUsageHistoryGraph, hWnd, hdc); - if (hWnd == hPerformancePageCpuUsageHistoryGraph) - GraphCtrl_Paint(&PerformancePageCpuUsageHistoryGraph, hWnd, hdc); + BitBlt(hdc, 0, 0, + rcClient.right, + rcClient.bottom, + graph->hdcGraph, + graph->BitmapWidth - rcClient.right, + 0, + SRCCOPY); EndPaint(hWnd, &ps); return 0; } diff --git a/base/applications/taskmgr/graphctl.h b/base/applications/taskmgr/graphctl.h index 428d9c30b7d..5ea2aeaa82d 100644 --- a/base/applications/taskmgr/graphctl.h +++ b/base/applications/taskmgr/graphctl.h @@ -22,94 +22,62 @@ #pragma once -#define MAX_PLOTS 4 -#define MAX_CTRLS 4 +#define NUM_PLOTS 2 +#define PLOT_SHIFT 2 #ifdef __cplusplus extern "C" { #endif -#if 0 -/* Attributes */ -public: - void SetXUnits(const char* string); - void SetYUnits(const char* string); - /* Operations */ -public: - BOOL Create(DWORD dwStyle, const RECT& rect, HWND hParentWnd, UINT nID=NULL); - -#endif - -typedef struct +typedef struct _TM_GRAPH_CONTROL { - int m_nShiftPixels; /* amount to shift with each new point */ - int m_nYDecimals; - - char m_strXUnitsString[50]; - char m_strYUnitsString[50]; - - COLORREF m_crBackColor; /* background color */ - COLORREF m_crGridColor; /* grid color */ - COLORREF m_crPlotColor[MAX_PLOTS]; /* data color */ - - double m_dCurrentPosition[MAX_PLOTS]; /* current position */ - double m_dPreviousPosition[MAX_PLOTS]; /* previous position */ - -/* those were protected fields */ - int m_nHalfShiftPixels; - int m_nPlotShiftPixels; - int m_nGridOffsetPixels; - int m_nClientHeight; - int m_nClientWidth; - int m_nPlotHeight; - int m_nPlotWidth; - int m_nGridXPixels; - int m_nGridYPixels; - - double m_dLowerLimit; /* lower bounds */ - double m_dUpperLimit; /* upper bounds */ - double m_dRange; - double m_dVerticalFactor; + HWND hParentWnd; + HWND hWnd; + HDC hdcGraph; + HBITMAP hbmGraph; + HPEN hPenGrid; + HPEN hPen0; + HPEN hPen1; + HBRUSH hBrushBack; + + INT BitmapWidth; + INT BitmapHeight; + INT GridCellWidth; + INT GridCellHeight; + INT CurrShift; + + PBYTE PointBuffer; + UINT32 NumberOfPoints; + UINT32 CurrIndex; + + FLOAT ftPixelsPerPercent; + BOOL DrawSecondaryPlot; +} +TM_GRAPH_CONTROL, *PTM_GRAPH_CONTROL; - HWND m_hWnd; - HWND m_hParentWnd; - HDC m_dcGrid; - HDC m_dcPlot; - HBITMAP m_bitmapOldGrid; - HBITMAP m_bitmapOldPlot; - HBITMAP m_bitmapGrid; - HBITMAP m_bitmapPlot; - HBRUSH m_brushBack; - HPEN m_penPlot[MAX_PLOTS]; - RECT m_rectClient; - RECT m_rectPlot; -} TGraphCtrl; +typedef struct _TM_FORMAT +{ + COLORREF clrBack; + COLORREF clrGrid; + COLORREF clrPlot0; + COLORREF clrPlot1; + INT GridCellWidth; + INT GridCellHeight; + BOOL DrawSecondaryPlot; +} +TM_FORMAT, *PTM_FORMAT; extern WNDPROC OldGraphCtrlWndProc; -double GraphCtrl_AppendPoint(TGraphCtrl* this, - double dNewPoint0, double dNewPoint1, - double dNewPoint2, double dNewPoint3); -void GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, -UINT nID); -void GraphCtrl_Dispose(TGraphCtrl* this); -void GraphCtrl_DrawPoint(TGraphCtrl* this); -void GraphCtrl_ShiftGrid(TGraphCtrl* this); -void GraphCtrl_InvalidateCtrl(TGraphCtrl* this, BOOL bResize); -void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc); -void GraphCtrl_Reset(TGraphCtrl* this); -void GraphCtrl_Resize(TGraphCtrl* this); -void GraphCtrl_SetBackgroundColor(TGraphCtrl* this, COLORREF -color); -void GraphCtrl_SetGridColor(TGraphCtrl* this, COLORREF color); -void GraphCtrl_SetPlotColor(TGraphCtrl* this, int plot, COLORREF -color); -void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double -dUpper, int nDecimalPlaces); - INT_PTR CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); +BOOL GraphCtrl_Create(PTM_GRAPH_CONTROL inst, HWND hWnd, HWND hParentWnd, PTM_FORMAT fmt); +void GraphCtrl_Dispose(PTM_GRAPH_CONTROL inst); +void GraphCtrl_AddPoint(PTM_GRAPH_CONTROL inst, BYTE val0, BYTE val1); +void GraphCtrl_RedrawOnHeightChange(PTM_GRAPH_CONTROL inst, INT nh); +void GraphCtrl_RedrawBitmap(PTM_GRAPH_CONTROL inst, INT h); + #ifdef __cplusplus } #endif diff --git a/base/applications/taskmgr/perfpage.c b/base/applications/taskmgr/perfpage.c index eb021d2ae38..4bf550a8ff1 100644 --- a/base/applications/taskmgr/perfpage.c +++ b/base/applications/taskmgr/perfpage.c @@ -25,8 +25,8 @@ extern BOOL bInMenuLoop; /* Tells us if we are in the menu loop - from taskmgr.c */ -TGraphCtrl PerformancePageCpuUsageHistoryGraph; -TGraphCtrl PerformancePageMemUsageHistoryGraph; +TM_GRAPH_CONTROL PerformancePageCpuUsageHistoryGraph; +TM_GRAPH_CONTROL PerformancePageMemUsageHistoryGraph; HWND hPerformancePage; /* Performance Property Page */ HWND hPerformancePageCpuUsageGraph; /* CPU Usage Graph */ @@ -128,6 +128,9 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_INITDIALOG: + { + BOOL bGraph; + TM_FORMAT fmt; /* Save the width and height */ GetClientRect(hDlg, &rc); @@ -168,30 +171,30 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hPerformancePageMemUsageHistoryGraph = GetDlgItem(hDlg, IDC_MEM_USAGE_HISTORY_GRAPH); hPerformancePageCpuUsageHistoryGraph = GetDlgItem(hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); - GetClientRect(hPerformancePageCpuUsageHistoryGraph, &rc); - /* create the control */ - /* PerformancePageCpuUsageHistoryGraph.Create(0, rc, hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); */ - GraphCtrl_Create(&PerformancePageCpuUsageHistoryGraph, hPerformancePageCpuUsageHistoryGraph, hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); - /* customize the control */ - GraphCtrl_SetRange(&PerformancePageCpuUsageHistoryGraph, 0.0, 100.0, 10); -/* PerformancePageCpuUsageHistoryGraph.SetYUnits("Current") ; */ -/* PerformancePageCpuUsageHistoryGraph.SetXUnits("Samples (Windows Timer: 100 msec)") ; */ -/* PerformancePageCpuUsageHistoryGraph.SetBackgroundColor(RGB(0, 0, 64)) ; */ -/* PerformancePageCpuUsageHistoryGraph.SetGridColor(RGB(192, 192, 255)) ; */ -/* PerformancePageCpuUsageHistoryGraph.SetPlotColor(RGB(255, 255, 255)) ; */ - GraphCtrl_SetBackgroundColor(&PerformancePageCpuUsageHistoryGraph, RGB(0, 0, 0)) ; - GraphCtrl_SetGridColor(&PerformancePageCpuUsageHistoryGraph, RGB(0, 128, 64)); - - GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 0, RGB(0, 255, 0)) ; - GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 1, RGB(255, 0, 0)) ; - - - GetClientRect(hPerformancePageMemUsageHistoryGraph, &rc); - GraphCtrl_Create(&PerformancePageMemUsageHistoryGraph, hPerformancePageMemUsageHistoryGraph, hDlg, IDC_MEM_USAGE_HISTORY_GRAPH); - GraphCtrl_SetRange(&PerformancePageMemUsageHistoryGraph, 0.0, 100.0, 10) ; - GraphCtrl_SetBackgroundColor(&PerformancePageMemUsageHistoryGraph, RGB(0, 0, 0)) ; - GraphCtrl_SetGridColor(&PerformancePageMemUsageHistoryGraph, RGB(0, 128, 64)) ; - GraphCtrl_SetPlotColor(&PerformancePageMemUsageHistoryGraph, 0, RGB(255, 255, 0)) ; + /* Create the controls */ + fmt.clrBack = RGB(0, 0, 0); + fmt.clrGrid = RGB(0, 128, 64); + fmt.clrPlot0 = RGB(0, 255, 0); + fmt.clrPlot1 = RGB(255, 0, 0); + fmt.GridCellWidth = fmt.GridCellHeight = 12; + fmt.DrawSecondaryPlot = TaskManagerSettings.ShowKernelTimes; + bGraph = GraphCtrl_Create(&PerformancePageCpuUsageHistoryGraph, hPerformancePageCpuUsageHistoryGraph, hDlg, &fmt); + if (!bGraph) + { + EndDialog(hDlg, 0); + return FALSE; + } + + fmt.clrPlot0 = RGB(255, 255, 0); + fmt.clrPlot1 = RGB(100, 255, 255); + fmt.DrawSecondaryPlot = TRUE; + bGraph = GraphCtrl_Create(&PerformancePageMemUsageHistoryGraph, hPerformancePageMemUsageHistoryGraph, hDlg, &fmt); + if (!bGraph) + { + EndDialog(hDlg, 0); + return FALSE; + } + /* Start our refresh thread */ #ifdef RUN_PERF_PAGE hPerformanceThread = CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, &dwPerformanceThread); @@ -205,6 +208,7 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) OldGraphCtrlWndProc = (WNDPROC)SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); SetWindowLongPtrW(hPerformancePageCpuUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); return TRUE; + } case WM_COMMAND: break; @@ -447,16 +451,12 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) SendMessageW(hStatusWnd, SB_SETTEXT, 1, (LPARAM)Text); } - if (TaskManagerSettings.ShowKernelTimes) - { - CpuKernelUsage = PerfDataGetProcessorSystemUsage(); - if (CpuKernelUsage <= 0) CpuKernelUsage = 0; - if (CpuKernelUsage > 100) CpuKernelUsage = 100; - } - else - { + CpuKernelUsage = PerfDataGetProcessorSystemUsage(); + if (CpuKernelUsage <= 0) CpuKernelUsage = 0; - } + else if (CpuKernelUsage > 100) + CpuKernelUsage = 100; + /* * Get the memory usage */ @@ -468,9 +468,8 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) PhysicalMemoryAvailable = PerfDataGetPhysicalMemoryAvailableK(); nBarsUsed2 = PhysicalMemoryTotal ? ((PhysicalMemoryAvailable * 100) / PhysicalMemoryTotal) : 0; - GraphCtrl_AppendPoint(&PerformancePageCpuUsageHistoryGraph, CpuUsage, CpuKernelUsage, 0.0, 0.0); - GraphCtrl_AppendPoint(&PerformancePageMemUsageHistoryGraph, nBarsUsed1, nBarsUsed2, 0.0, 0.0); - /* PerformancePageMemUsageHistoryGraph.SetRange(0.0, 100.0, 10) ; */ + GraphCtrl_AddPoint(&PerformancePageCpuUsageHistoryGraph, CpuUsage, CpuKernelUsage); + GraphCtrl_AddPoint(&PerformancePageMemUsageHistoryGraph, nBarsUsed1, nBarsUsed2); InvalidateRect(hPerformancePageMemUsageHistoryGraph, NULL, FALSE); InvalidateRect(hPerformancePageCpuUsageHistoryGraph, NULL, FALSE); } @@ -491,13 +490,16 @@ void PerformancePage_OnViewShowKernelTimes(void) { CheckMenuItem(hViewMenu, ID_VIEW_SHOWKERNELTIMES, MF_BYCOMMAND|MF_UNCHECKED); TaskManagerSettings.ShowKernelTimes = FALSE; + PerformancePageCpuUsageHistoryGraph.DrawSecondaryPlot = FALSE; } else { CheckMenuItem(hViewMenu, ID_VIEW_SHOWKERNELTIMES, MF_BYCOMMAND|MF_CHECKED); TaskManagerSettings.ShowKernelTimes = TRUE; + PerformancePageCpuUsageHistoryGraph.DrawSecondaryPlot = TRUE; } + GraphCtrl_RedrawBitmap(&PerformancePageCpuUsageHistoryGraph, PerformancePageCpuUsageHistoryGraph.BitmapHeight); RefreshPerformancePage(); }

1 0

[reactos] 01/02: [TASKMGR] Formatting changes only
by Hermès Bélusca-Maïto 16 Dec '21

16 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2c8fe2c55eb32f4902b3… commit b2c8fe2c55eb32f4902b3db60c1596ce0b125576 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 16 00:23:46 2021 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Dec 16 03:06:04 2021 +0300 [TASKMGR] Formatting changes only --- base/applications/taskmgr/graphctl.c | 158 ++++++++++++++++++----------------- 1 file changed, 81 insertions(+), 77 deletions(-) diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index ee7a9f844f2..de60958ef02 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -591,87 +591,91 @@ GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) switch (message) { - case WM_ERASEBKGND: - return TRUE; - /* - * Filter out mouse & keyboard messages - */ - /* case WM_APPCOMMAND: */ - case WM_CAPTURECHANGED: - case WM_LBUTTONDBLCLK: - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_MBUTTONDBLCLK: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEACTIVATE: - case WM_MOUSEHOVER: - case WM_MOUSELEAVE: - case WM_MOUSEMOVE: - /* case WM_MOUSEWHEEL: */ - case WM_NCHITTEST: - case WM_NCLBUTTONDBLCLK: - case WM_NCLBUTTONDOWN: - case WM_NCLBUTTONUP: - case WM_NCMBUTTONDBLCLK: - case WM_NCMBUTTONDOWN: - case WM_NCMBUTTONUP: - /* case WM_NCMOUSEHOVER: */ - /* case WM_NCMOUSELEAVE: */ - case WM_NCMOUSEMOVE: - case WM_NCRBUTTONDBLCLK: - case WM_NCRBUTTONDOWN: - case WM_NCRBUTTONUP: - /* case WM_NCXBUTTONDBLCLK: */ - /* case WM_NCXBUTTONDOWN: */ - /* case WM_NCXBUTTONUP: */ - case WM_RBUTTONDBLCLK: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - /* case WM_XBUTTONDBLCLK: */ - /* case WM_XBUTTONDOWN: */ - /* case WM_XBUTTONUP: */ - case WM_ACTIVATE: - case WM_CHAR: - case WM_DEADCHAR: - case WM_GETHOTKEY: - case WM_HOTKEY: - case WM_KEYDOWN: - case WM_KEYUP: - case WM_KILLFOCUS: - case WM_SETFOCUS: - case WM_SETHOTKEY: - case WM_SYSCHAR: - case WM_SYSDEADCHAR: - case WM_SYSKEYDOWN: - case WM_SYSKEYUP: - return 0; - - case WM_NCCALCSIZE: - return 0; - - case WM_SIZE: - if (hWnd == hPerformancePageMemUsageHistoryGraph) + case WM_ERASEBKGND: + return TRUE; + /* + * Filter out mouse & keyboard messages + */ + // case WM_APPCOMMAND: + case WM_CAPTURECHANGED: + case WM_LBUTTONDBLCLK: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_MBUTTONDBLCLK: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEACTIVATE: + case WM_MOUSEHOVER: + case WM_MOUSELEAVE: + case WM_MOUSEMOVE: + // case WM_MOUSEWHEEL: + case WM_NCHITTEST: + case WM_NCLBUTTONDBLCLK: + case WM_NCLBUTTONDOWN: + case WM_NCLBUTTONUP: + case WM_NCMBUTTONDBLCLK: + case WM_NCMBUTTONDOWN: + case WM_NCMBUTTONUP: + // case WM_NCMOUSEHOVER: + // case WM_NCMOUSELEAVE: + case WM_NCMOUSEMOVE: + case WM_NCRBUTTONDBLCLK: + case WM_NCRBUTTONDOWN: + case WM_NCRBUTTONUP: + // case WM_NCXBUTTONDBLCLK: + // case WM_NCXBUTTONDOWN: + // case WM_NCXBUTTONUP: + case WM_RBUTTONDBLCLK: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + // case WM_XBUTTONDBLCLK: + // case WM_XBUTTONDOWN: + // case WM_XBUTTONUP: + case WM_ACTIVATE: + case WM_CHAR: + case WM_DEADCHAR: + case WM_GETHOTKEY: + case WM_HOTKEY: + case WM_KEYDOWN: + case WM_KEYUP: + case WM_KILLFOCUS: + case WM_SETFOCUS: + case WM_SETHOTKEY: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + return 0; + + case WM_NCCALCSIZE: + return 0; + + case WM_SIZE: { - GraphCtrl_Resize(&PerformancePageMemUsageHistoryGraph); - GraphCtrl_InvalidateCtrl(&PerformancePageMemUsageHistoryGraph, TRUE); + if (hWnd == hPerformancePageMemUsageHistoryGraph) + { + GraphCtrl_Resize(&PerformancePageMemUsageHistoryGraph); + GraphCtrl_InvalidateCtrl(&PerformancePageMemUsageHistoryGraph, TRUE); + } + if (hWnd == hPerformancePageCpuUsageHistoryGraph) + { + GraphCtrl_Resize(&PerformancePageCpuUsageHistoryGraph); + GraphCtrl_InvalidateCtrl(&PerformancePageCpuUsageHistoryGraph, TRUE); + } + return 0; } - if (hWnd == hPerformancePageCpuUsageHistoryGraph) + + case WM_PAINT: { - GraphCtrl_Resize(&PerformancePageCpuUsageHistoryGraph); - GraphCtrl_InvalidateCtrl(&PerformancePageCpuUsageHistoryGraph, TRUE); + hdc = BeginPaint(hWnd, &ps); + GetClientRect(hWnd, &rcClient); + if (hWnd == hPerformancePageMemUsageHistoryGraph) + GraphCtrl_Paint(&PerformancePageMemUsageHistoryGraph, hWnd, hdc); + if (hWnd == hPerformancePageCpuUsageHistoryGraph) + GraphCtrl_Paint(&PerformancePageCpuUsageHistoryGraph, hWnd, hdc); + EndPaint(hWnd, &ps); + return 0; } - return 0; - - case WM_PAINT: - hdc = BeginPaint(hWnd, &ps); - GetClientRect(hWnd, &rcClient); - if (hWnd == hPerformancePageMemUsageHistoryGraph) - GraphCtrl_Paint(&PerformancePageMemUsageHistoryGraph, hWnd, hdc); - if (hWnd == hPerformancePageCpuUsageHistoryGraph) - GraphCtrl_Paint(&PerformancePageCpuUsageHistoryGraph, hWnd, hdc); - EndPaint(hWnd, &ps); - return 0; } /*

1 0

[reactos] 01/01: [SHELL32] Show error message if move or copy operation failed (#4155)
by Denis Malikov 15 Dec '21

15 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ef8e41cc9483f7665666… commit 8ef8e41cc9483f7665666641cfdd48f5d71a1a7c Author: Denis Malikov <Getequ(a)users.noreply.github.com> AuthorDate: Wed Dec 15 21:42:47 2021 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 15 17:42:47 2021 +0300 [SHELL32] Show error message if move or copy operation failed (#4155) This allows user to know when there is not enough space on the target media, when there is no permissions for the operation, or some other error. CORE-9239 --- dll/win32/shell32/lang/bg-BG.rc | 2 ++ dll/win32/shell32/lang/ca-ES.rc | 2 ++ dll/win32/shell32/lang/cs-CZ.rc | 2 ++ dll/win32/shell32/lang/da-DK.rc | 2 ++ dll/win32/shell32/lang/de-DE.rc | 2 ++ dll/win32/shell32/lang/el-GR.rc | 2 ++ dll/win32/shell32/lang/en-GB.rc | 2 ++ dll/win32/shell32/lang/en-US.rc | 2 ++ dll/win32/shell32/lang/es-ES.rc | 2 ++ dll/win32/shell32/lang/et-EE.rc | 2 ++ dll/win32/shell32/lang/fi-FI.rc | 2 ++ dll/win32/shell32/lang/fr-FR.rc | 2 ++ dll/win32/shell32/lang/he-IL.rc | 2 ++ dll/win32/shell32/lang/hi-IN.rc | 2 ++ dll/win32/shell32/lang/hu-HU.rc | 2 ++ dll/win32/shell32/lang/id-ID.rc | 2 ++ dll/win32/shell32/lang/it-IT.rc | 2 ++ dll/win32/shell32/lang/ja-JP.rc | 2 ++ dll/win32/shell32/lang/ko-KR.rc | 2 ++ dll/win32/shell32/lang/nl-NL.rc | 2 ++ dll/win32/shell32/lang/no-NO.rc | 2 ++ dll/win32/shell32/lang/pl-PL.rc | 2 ++ dll/win32/shell32/lang/pt-BR.rc | 2 ++ dll/win32/shell32/lang/pt-PT.rc | 2 ++ dll/win32/shell32/lang/ro-RO.rc | 2 ++ dll/win32/shell32/lang/ru-RU.rc | 6 +++-- dll/win32/shell32/lang/sk-SK.rc | 2 ++ dll/win32/shell32/lang/sl-SI.rc | 2 ++ dll/win32/shell32/lang/sq-AL.rc | 2 ++ dll/win32/shell32/lang/sv-SE.rc | 2 ++ dll/win32/shell32/lang/tr-TR.rc | 2 ++ dll/win32/shell32/lang/uk-UA.rc | 2 ++ dll/win32/shell32/lang/zh-CN.rc | 2 ++ dll/win32/shell32/lang/zh-TW.rc | 2 ++ dll/win32/shell32/shlfileop.cpp | 51 +++++++++++++++++++++++++++++++++++++++++ dll/win32/shell32/shresdef.h | 2 ++ 36 files changed, 123 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 29053c2ddcd..703d1837dad 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -806,6 +806,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 6262d5a19ee..12063262bc3 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index dafe2216d03..187c0c2c892 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -811,6 +811,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit" IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 3e6baa9b2ae..6f41e1b47df 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -811,6 +811,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index f176b284e9b..e9aa547ecff 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -806,6 +806,8 @@ BEGIN IDS_COPYERRORSAME "'%s' kann nicht kopiert werden: Quell- und Zieldatei sind identisch." IDS_MOVEERRORSUBFOLDER "'%s' kann nicht verschoben werden: Der Zielorder ist ein Unterordner des Quellordners." IDS_COPYERRORSUBFOLDER "'%s' kann nicht kopiert werden: Der Zielorder ist ein Unterordner des Quellordners." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 813d78e3989..3aaa46cf184 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index e8400de4545..cc4dad3cbe3 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 5d36961e0cd..757e4ea2bc3 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 596203601f0..30437706199 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -814,6 +814,8 @@ BEGIN IDS_COPYERRORSAME "Imposible copiar '%s': El archivo de origen y el de destino son el mismo." IDS_MOVEERRORSUBFOLDER "Imposible mover '%s': La carpeta de destino es un subdirectorio de la de origen." IDS_COPYERRORSUBFOLDER "Imposible copiar '%s': La carpeta de destino es un subdirectorio de la de origen." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "No se pudo crear la carpeta '%1'" IDS_CREATEFOLDER_CAPTION "No se pudo crear la carpeta" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index e36e88aabc4..d77888fa7bb 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -812,6 +812,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Ei saa luua kausta '%1'" IDS_CREATEFOLDER_CAPTION "Ei saa kausta luua" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index c37618c3af9..a20594097ed 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 86b1b69717e..fdcb8e66a01 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Impossible de copier '%s' : Les noms des fichiers source et destination sont identiques." IDS_MOVEERRORSUBFOLDER "Impossible de déplacer '%s' : Le dossier de destination est un sous-dossier du dossier source." IDS_COPYERRORSUBFOLDER "Impossible de copier '%s' : Le dossier de destination est un sous-dossier du dossier source." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'" IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index b8e3ce71d08..f086b8abb10 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -807,6 +807,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index cb6ad494f48..3096d6999a3 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "फ़ोल्डर '%1' बनाने में असमर्थ" IDS_CREATEFOLDER_CAPTION "फ़ोल्डर बनाने में असमर्थ" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index c2ec4d550d6..45febcd796d 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -804,6 +804,8 @@ BEGIN IDS_COPYERRORSAME "'%s' nem másolható: a forrás- és célfájl ugyanaz." IDS_MOVEERRORSUBFOLDER "'%s' nem mozgatható: a célmappa a forrásmappa egyik almappája." IDS_COPYERRORSUBFOLDER "'%s' nem másolható: a célmappa a forrásmappa egyik almappája." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Nem sikerült a(z) '%1' mappa létrehozása." IDS_CREATEFOLDER_CAPTION "Nem sikerült létrehozni a mappát" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 4c8e9a72e04..03a6d9a123e 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -802,6 +802,8 @@ BEGIN IDS_COPYERRORSAME "Tidak bisa menyalin '%s': Nama berkas asal dan tujuan sama." IDS_MOVEERRORSUBFOLDER "Tidak bisa memindahkan '%s': Folder tujuan merupakan subfolder dari folder asal." IDS_COPYERRORSUBFOLDER "Tidak bisa menyalin '%s': Folder tujuan merupakan subfolder dari folder asal." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Tidak bisa membuat folder folder '%1'" IDS_CREATEFOLDER_CAPTION "Tidak bisa membuat folder" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 6f1093cd913..615ff750298 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 763f17f4779..ff6eb6994a1 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -802,6 +802,8 @@ BEGIN IDS_COPYERRORSAME "コピーできません '%s': コピー元とコピー先のファイル名が同じです。" IDS_MOVEERRORSUBFOLDER "移動できません '%s': 移動先のフォルダは移動元のフォルダのサブフォルダです。" IDS_COPYERRORSUBFOLDER "コピーできません '%s': コピー先のフォルダはコピー元のフォルダのサブフォルダです。" + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 8939d0e7947..8f77796c636 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 16cf100515b..d86abbe3566 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 086d403e6da..7eaca4b45e9 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 9214d71d909..dec9704c99b 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -811,6 +811,8 @@ BEGIN IDS_COPYERRORSAME "Nie można skopiować '%s': Nazwy plików źródłowego i docelowego są takie same." IDS_MOVEERRORSUBFOLDER "Nie można przenieść '%s': Folder docelowy jest podfolderem folderu źródłowego." IDS_COPYERRORSUBFOLDER "Nie można skopiować '%s': Folder docelowy jest podfolderem folderu źródłowego." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Nie można utworzyć folderu '%1'" IDS_CREATEFOLDER_CAPTION "Nie można utworzyć folderu" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 614f1ef8dc0..922a741bb01 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 2d58a03cd79..84ce916ffa8 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Impossivel copiar '%s': Os nomes dos arquivos de origem e de destino são os mesmos." IDS_MOVEERRORSUBFOLDER "Impossivel mover '%s': A pasta de destino é uma subpasta da pasta de origem." IDS_COPYERRORSUBFOLDER "Impossivel copiar '%s': A pasta de destino é uma subpasta da pasta de origem." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Impossivel criar pasta '%1'" IDS_CREATEFOLDER_CAPTION "Impossivel criar pasta" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 1de40d0d214..52262c0e66e 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -807,6 +807,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Nu poate fi creat un dosar cu numele „%1”" IDS_CREATEFOLDER_CAPTION "Nu poate fi creat dosar" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 8c8fdcdc7b7..fd4b752c8b8 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -805,13 +805,15 @@ BEGIN IDS_OPENFILELOCATION "Открыть &расположение объекта" IDS_SENDTO_MENU "Отправит&ь" - IDS_MOVEERRORTITLE "Error Moving File or Folder" - IDS_COPYERRORTITLE "Error Copying File or Folder" + 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_MOVEERROR "Не удаётся переместить '%s': %s" + IDS_COPYERROR "Не удаётся скопировать '%s': %s" IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'" IDS_CREATEFOLDER_CAPTION "Невозможно создать папку" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 2bfb217380d..f880a915846 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index a7f42e94382..d2a99c525e6 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 32c275cc326..bb63c6f5f8c 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -809,6 +809,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 915ef081f52..5fd6a37ceac 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'" IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 52d060c06d9..aaaf53eabd4 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -807,6 +807,8 @@ BEGIN IDS_COPYERRORSAME "'%s' kopyalanamıyor: Kaynak ve hedef dosya adları aynı." IDS_MOVEERRORSUBFOLDER "'%s' taşınamıyor: Hedef dizin, kaynak dizinin bir alt dizinidir." IDS_COPYERRORSUBFOLDER "'%s' kopyalanamıyor: Hedef dizin, kaynak dizinin bir alt dizinidir." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED """%1"" dizini oluşturulamıyor." IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 6a465c79edf..e03599d3be3 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Не вдалося створити папку '%1'" IDS_CREATEFOLDER_CAPTION "Не вдалося створити папку" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index cafd0a4dff4..42ae713d7ef 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -813,6 +813,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "无法创建文件夹 '%1'" IDS_CREATEFOLDER_CAPTION "无法创建文件夹" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 064076cd7a5..8e1e75b9d01 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -813,6 +813,8 @@ BEGIN IDS_COPYERRORSAME "無法複製「%s」：來源及目的地的檔案名稱相同。" IDS_MOVEERRORSUBFOLDER "無法移動「%s」：目的資料夾是來源資料夾的子資料夾。" IDS_COPYERRORSUBFOLDER "無法複製「%s」：目的資料夾是來源資料夾的子資料夾。" + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "無法建立資料夾「%1」" IDS_CREATEFOLDER_CAPTION "無法建立資料夾" diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 8fd4179ba93..59aa0cf2b09 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -663,6 +663,48 @@ EXTERN_C DWORD WINAPI Win32DeleteFileW(LPCWSTR path) return (SHNotifyDeleteFileW(NULL, path) == ERROR_SUCCESS); } +#ifdef __REACTOS__ +/************************************************************************ + * CheckForError [internal] + * + * Show message box if operation failed + * + * PARAMS + * op [I] File Operation context + * error [I] Error code + * src [I] Source file full name + * + */ +static DWORD CheckForError(FILE_OPERATION *op, DWORD error, LPCWSTR src) +{ + CStringW strTitle, strMask, strText; + LPWSTR lpMsgBuffer; + + if (error == ERROR_SUCCESS || (op->req->fFlags & (FOF_NOERRORUI | FOF_SILENT))) + goto exit; + + strTitle.LoadStringW(op->req->wFunc == FO_COPY ? IDS_COPYERRORTITLE : IDS_MOVEERRORTITLE); + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMsgBuffer, + 0, + NULL); + + strText.Format(op->req->wFunc == FO_COPY ? IDS_COPYERROR : IDS_MOVEERROR, + PathFindFileNameW(src), + lpMsgBuffer); + + MessageBoxW(op->req->hwnd, strText, strTitle, MB_ICONERROR); + LocalFree(lpMsgBuffer); + +exit: + return error; +} +#endif + /************************************************************************ * SHNotifyMoveFile [internal] * @@ -710,7 +752,12 @@ static DWORD SHNotifyMoveFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BO SHChangeNotify(isdir ? SHCNE_RMDIR : SHCNE_DELETE, SHCNF_PATHW, src, NULL); return ERROR_SUCCESS; } + +#ifdef __REACTOS__ + return CheckForError(op, GetLastError(), src); +#else return GetLastError(); +#endif } /************************************************************************ @@ -757,7 +804,11 @@ static DWORD SHNotifyCopyFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BO return ERROR_SUCCESS; } +#ifdef __REACTOS__ + return CheckForError(op, GetLastError(), src); +#else return GetLastError(); +#endif } /************************************************************************* diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index dcad860d37f..b6bb348d2ba 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -250,6 +250,8 @@ #define IDS_COPYERRORSAME 348 #define IDS_MOVEERRORSUBFOLDER 349 #define IDS_COPYERRORSUBFOLDER 350 +#define IDS_MOVEERROR 351 +#define IDS_COPYERROR 352 #define IDS_MENU_EMPTY 34561

1 0

[reactos] 01/01: [EXPLORER] Use ShowWindowAsync in CTrayWindow::RestoreAll()
by Katayama Hirofumi MZ 14 Dec '21

14 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e055b0623c94bfad785e6… commit e055b0623c94bfad785e67c5a913d544e569ec32 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 14 23:12:01 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 14 23:12:01 2021 +0900 [EXPLORER] Use ShowWindowAsync in CTrayWindow::RestoreAll() Here, ShowWindowAsync is better than ShowWindow. CORE-17894 --- base/shell/explorer/traywnd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 2b69e48bb02..b052b856404 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2905,7 +2905,7 @@ HandleTrayContextMenu: HWND hwnd = g_MinimizedAll[i]; if (::IsWindowVisible(hwnd) && ::IsIconic(hwnd)) { - ::ShowWindow(hwnd, SW_RESTORE); + ::ShowWindowAsync(hwnd, SW_RESTORE); } } g_MinimizedAll.RemoveAll();

1 0

[reactos] 01/01: [XCOPY] Add missing Syntax parameter in STRING_HELP string (#4161)
by Chan Chilung 14 Dec '21

14 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10c7145cc690ab60e53b0… commit 10c7145cc690ab60e53b0a5cdf95d1a1298471ed Author: Chan Chilung <eason066(a)gmail.com> AuthorDate: Tue Dec 14 08:34:06 2021 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 14 03:34:06 2021 +0300 [XCOPY] Add missing Syntax parameter in STRING_HELP string (#4161) --- base/applications/cmdutils/xcopy/lang/da-DK.rc | 2 +- base/applications/cmdutils/xcopy/lang/de-DE.rc | 2 +- base/applications/cmdutils/xcopy/lang/en-US.rc | 2 +- base/applications/cmdutils/xcopy/lang/es-ES.rc | 2 +- base/applications/cmdutils/xcopy/lang/fr-FR.rc | 2 +- base/applications/cmdutils/xcopy/lang/it-IT.rc | 2 +- base/applications/cmdutils/xcopy/lang/ja-JP.rc | 2 +- base/applications/cmdutils/xcopy/lang/ko-KR.rc | 2 +- base/applications/cmdutils/xcopy/lang/lt-LT.rc | 2 +- base/applications/cmdutils/xcopy/lang/nl-NL.rc | 2 +- base/applications/cmdutils/xcopy/lang/no-NO.rc | 2 +- base/applications/cmdutils/xcopy/lang/pl-PL.rc | 2 +- base/applications/cmdutils/xcopy/lang/pt-BR.rc | 2 +- base/applications/cmdutils/xcopy/lang/pt-PT.rc | 2 +- base/applications/cmdutils/xcopy/lang/ro-RO.rc | 2 +- base/applications/cmdutils/xcopy/lang/ru-RU.rc | 2 +- base/applications/cmdutils/xcopy/lang/sl-SI.rc | 2 +- base/applications/cmdutils/xcopy/lang/sq-AL.rc | 2 +- base/applications/cmdutils/xcopy/lang/sr-SP.rc | 2 +- base/applications/cmdutils/xcopy/lang/sv-SE.rc | 2 +- base/applications/cmdutils/xcopy/lang/tr-TR.rc | 2 +- base/applications/cmdutils/xcopy/lang/uk-UA.rc | 2 +- base/applications/cmdutils/xcopy/lang/zh-CN.rc | 2 +- base/applications/cmdutils/xcopy/lang/zh-TW.rc | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/base/applications/cmdutils/xcopy/lang/da-DK.rc b/base/applications/cmdutils/xcopy/lang/da-DK.rc index 6fda70a96ae..36b82c21c5f 100644 --- a/base/applications/cmdutils/xcopy/lang/da-DK.rc +++ b/base/applications/cmdutils/xcopy/lang/da-DK.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntaks:\n\ XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ hvor:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/de-DE.rc b/base/applications/cmdutils/xcopy/lang/de-DE.rc index 4e4e711eae9..05dc76719ac 100644 --- a/base/applications/cmdutils/xcopy/lang/de-DE.rc +++ b/base/applications/cmdutils/xcopy/lang/de-DE.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Mit:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/en-US.rc b/base/applications/cmdutils/xcopy/lang/en-US.rc index a63c83829c7..0d15eedff53 100644 --- a/base/applications/cmdutils/xcopy/lang/en-US.rc +++ b/base/applications/cmdutils/xcopy/lang/en-US.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/es-ES.rc b/base/applications/cmdutils/xcopy/lang/es-ES.rc index 3845af2ca5f..4de47407651 100644 --- a/base/applications/cmdutils/xcopy/lang/es-ES.rc +++ b/base/applications/cmdutils/xcopy/lang/es-ES.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaxis:\n\ XCOPY fuente [destino] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ En la cual:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/fr-FR.rc b/base/applications/cmdutils/xcopy/lang/fr-FR.rc index de5ee1f9f99..fd97858751c 100644 --- a/base/applications/cmdutils/xcopy/lang/fr-FR.rc +++ b/base/applications/cmdutils/xcopy/lang/fr-FR.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntaxe :\n\ XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ où :\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/it-IT.rc b/base/applications/cmdutils/xcopy/lang/it-IT.rc index 4ffdf5444bc..99fcdc0bb5f 100644 --- a/base/applications/cmdutils/xcopy/lang/it-IT.rc +++ b/base/applications/cmdutils/xcopy/lang/it-IT.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintassi:\n\ XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Dove:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/ja-JP.rc b/base/applications/cmdutils/xcopy/lang/ja-JP.rc index 2eec6791e0b..22b28129629 100644 --- a/base/applications/cmdutils/xcopy/lang/ja-JP.rc +++ b/base/applications/cmdutils/xcopy/lang/ja-JP.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ 構文:\n\ XCOPY 送り元 [送り先] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ オプション:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/ko-KR.rc b/base/applications/cmdutils/xcopy/lang/ko-KR.rc index 7b7f5066659..45d913ca017 100644 --- a/base/applications/cmdutils/xcopy/lang/ko-KR.rc +++ b/base/applications/cmdutils/xcopy/lang/ko-KR.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ 문법:\n\ XCOPY 원본 [대상] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/lt-LT.rc b/base/applications/cmdutils/xcopy/lang/lt-LT.rc index 0be2b448606..ff0e1f608ea 100644 --- a/base/applications/cmdutils/xcopy/lang/lt-LT.rc +++ b/base/applications/cmdutils/xcopy/lang/lt-LT.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaksė:\n\ XCOPY šaltinis [paskirtis] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Kur:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/nl-NL.rc b/base/applications/cmdutils/xcopy/lang/nl-NL.rc index db714d14b34..54c43d97662 100644 --- a/base/applications/cmdutils/xcopy/lang/nl-NL.rc +++ b/base/applications/cmdutils/xcopy/lang/nl-NL.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Gebruik:\n\ XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Parameters:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/no-NO.rc b/base/applications/cmdutils/xcopy/lang/no-NO.rc index e051212d899..ca959535282 100644 --- a/base/applications/cmdutils/xcopy/lang/no-NO.rc +++ b/base/applications/cmdutils/xcopy/lang/no-NO.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/pl-PL.rc b/base/applications/cmdutils/xcopy/lang/pl-PL.rc index f6f30597b4c..e967982f695 100644 --- a/base/applications/cmdutils/xcopy/lang/pl-PL.rc +++ b/base/applications/cmdutils/xcopy/lang/pl-PL.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Składnia:\n\ XCOPY źródło [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Gdzie:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/pt-BR.rc b/base/applications/cmdutils/xcopy/lang/pt-BR.rc index 3ed93b06c9b..da77856c889 100644 --- a/base/applications/cmdutils/xcopy/lang/pt-BR.rc +++ b/base/applications/cmdutils/xcopy/lang/pt-BR.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaxe:\n\ XCOPY fonte [destino] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Onde:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/pt-PT.rc b/base/applications/cmdutils/xcopy/lang/pt-PT.rc index db3fd7eb9a4..a24e0c8b52a 100644 --- a/base/applications/cmdutils/xcopy/lang/pt-PT.rc +++ b/base/applications/cmdutils/xcopy/lang/pt-PT.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaxe:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Onde:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/ro-RO.rc b/base/applications/cmdutils/xcopy/lang/ro-RO.rc index 66d0b852cfd..ae6d267ed9d 100644 --- a/base/applications/cmdutils/xcopy/lang/ro-RO.rc +++ b/base/applications/cmdutils/xcopy/lang/ro-RO.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaxă:\n\ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \nCu:\n\ \n\ [/I] Creează director dacă destinația nu există și copiază două sau\n\ diff --git a/base/applications/cmdutils/xcopy/lang/ru-RU.rc b/base/applications/cmdutils/xcopy/lang/ru-RU.rc index 72e59651354..7c24552802d 100644 --- a/base/applications/cmdutils/xcopy/lang/ru-RU.rc +++ b/base/applications/cmdutils/xcopy/lang/ru-RU.rc @@ -27,7 +27,7 @@ STRINGTABLE \n\ Синтаксис:\n\ XCOPY источник [целевой_объект] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ \n\ источник Копируемые файлы.\n\ diff --git a/base/applications/cmdutils/xcopy/lang/sl-SI.rc b/base/applications/cmdutils/xcopy/lang/sl-SI.rc index 4759f1d6bf3..aa169456ce8 100644 --- a/base/applications/cmdutils/xcopy/lang/sl-SI.rc +++ b/base/applications/cmdutils/xcopy/lang/sl-SI.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaksa:\n\ XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/sq-AL.rc b/base/applications/cmdutils/xcopy/lang/sq-AL.rc index 98ebebb2e80..632ade15945 100644 --- a/base/applications/cmdutils/xcopy/lang/sq-AL.rc +++ b/base/applications/cmdutils/xcopy/lang/sq-AL.rc @@ -30,7 +30,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/sr-SP.rc b/base/applications/cmdutils/xcopy/lang/sr-SP.rc index 0ba72eedc91..28c4798ee7c 100644 --- a/base/applications/cmdutils/xcopy/lang/sr-SP.rc +++ b/base/applications/cmdutils/xcopy/lang/sr-SP.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Синтакса:\n\ XCOPY извор [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Где:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/sv-SE.rc b/base/applications/cmdutils/xcopy/lang/sv-SE.rc index 015a6a0a6f0..1537287fde1 100644 --- a/base/applications/cmdutils/xcopy/lang/sv-SE.rc +++ b/base/applications/cmdutils/xcopy/lang/sv-SE.rc @@ -24,7 +24,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY källa [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Där:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/tr-TR.rc b/base/applications/cmdutils/xcopy/lang/tr-TR.rc index 95ec8039da5..7925e9667de 100644 --- a/base/applications/cmdutils/xcopy/lang/tr-TR.rc +++ b/base/applications/cmdutils/xcopy/lang/tr-TR.rc @@ -28,7 +28,7 @@ STRINGTABLE \n\ Yazım:\n\ XCOPY kaynak [hedef] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Nereye:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/uk-UA.rc b/base/applications/cmdutils/xcopy/lang/uk-UA.rc index fed492272d6..7716742b7d7 100644 --- a/base/applications/cmdutils/xcopy/lang/uk-UA.rc +++ b/base/applications/cmdutils/xcopy/lang/uk-UA.rc @@ -25,7 +25,7 @@ STRINGTABLE \n\ Синтаксис:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Де:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/zh-CN.rc b/base/applications/cmdutils/xcopy/lang/zh-CN.rc index e7793371651..e529f19b772 100644 --- a/base/applications/cmdutils/xcopy/lang/zh-CN.rc +++ b/base/applications/cmdutils/xcopy/lang/zh-CN.rc @@ -28,7 +28,7 @@ STRINGTABLE \n\ 语法:\n\ XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ 地点:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/zh-TW.rc b/base/applications/cmdutils/xcopy/lang/zh-TW.rc index c7f44937edb..b1023e3a281 100644 --- a/base/applications/cmdutils/xcopy/lang/zh-TW.rc +++ b/base/applications/cmdutils/xcopy/lang/zh-TW.rc @@ -28,7 +28,7 @@ STRINGTABLE \n\ 語法:\n\ XCOPY 源 [目標] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ 地點:\n\ \n\

1 0

[reactos] 01/01: [HELP] Fix (tr-TR) rc sporadic compilation error on VS (#4162)
by Rubén Mendoza Luna 14 Dec '21

14 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7fa746172844f23856b1… commit b7fa746172844f23856b12cb57087902134815a2 Author: Rubén Mendoza Luna <rbm3ndozal(a)gmail.com> AuthorDate: Mon Dec 13 15:11:27 2021 -0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Dec 14 03:22:44 2021 +0300 [HELP] Fix (tr-TR) rc sporadic compilation error on VS (#4162) Fix (tr-TR) resource file compilation error RC2102 on VS2015 and 2017. Based on the work done at CORE-7405, moves the string split location so the first part of the message isn't too long anymore. CORE-17910 --- base/applications/cmdutils/help/lang/tr-TR.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/cmdutils/help/lang/tr-TR.rc b/base/applications/cmdutils/help/lang/tr-TR.rc index 9479d5c91cc..ead3370d2ec 100644 --- a/base/applications/cmdutils/help/lang/tr-TR.rc +++ b/base/applications/cmdutils/help/lang/tr-TR.rc @@ -44,8 +44,8 @@ IF Toplu iş dosyalarında şartlı eşleşmeyi gerçekleştirir.\n\ LABEL Bir diskin birim etiketini oluşturur, değiştirir ya da siler.\n\ MD Bir dizin oluşturur.\n\ MKDIR Bir dizin oluşturur.\n\ -MKLINK Bir dosya dizisi bağlantı nesnesi oluşturur.\n\ -MOVE Bir dizinden bir ya da daha çok dosyayı başka bir dizine taşır.\n\ +MKLINK Bir dosya dizisi bağlantı nesnesi oluşturur.\n" + IDS_HELP2 "MOVE Bir dizinden bir ya da daha çok dosyayı başka bir dizine taşır.\n\ PATH Çalıştırılabilir dosyalar için varsayılan arama yolunu görüntüler ya da\n\ yeni bir arama yolu oluşturur.\n\ PAUSE Bir toplu iş dosyasında işlemeyi askıya alır ve bir ileti görüntüler.\n\ @@ -62,8 +62,8 @@ RMDIR Bir dizin siler.\n\ SCREEN İmleci taşır ve isteğe bağlı olarak olarak metin yazdır.\n\ SET ReactOS çevresel değişkenlerini görüntüler, ayarlar ya da kaldırır.\n\ SHIFT Toplu iş dosyalarındaki yerine konulabilir değişkenlerin konumunu\n\ - değiştirir.\n" - IDS_HELP2 "START Belirtilen bir programı ya da komutu çalıştırmak için ayrı bir\n\ + değiştirir.\n\ +START Belirtilen bir programı ya da komutu çalıştırmak için ayrı bir\n\ pencere başlatır.\n\ Komut çalıştırır.\n\ TIME Sistem saatini görüntüler ya da ayarlar.\n\

1 0

[reactos] 01/01: [E1000] Minor improvements (#3904)
by Dmitry Borisov 13 Dec '21

13 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f97671319509df175dd5… commit 3f97671319509df175dd5702d670aaa2ff8ea99a Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Dec 14 04:57:33 2021 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 14 01:57:33 2021 +0300 [E1000] Minor improvements (#3904) - Add support for 64-bit counters (Intel gigabit NICs) - Properly handle OIDs - Check that the packet filter is not 0 - Performance increase --- drivers/network/dd/e1000/CMakeLists.txt | 3 +- drivers/network/dd/e1000/hardware.c | 107 +-------------------- drivers/network/dd/e1000/info.c | 158 +++++++++++++++++++++----------- drivers/network/dd/e1000/interrupt.c | 29 ++++-- drivers/network/dd/e1000/ndis.c | 45 +-------- drivers/network/dd/e1000/nic.h | 93 ++++++++++++------- drivers/network/dd/e1000/send.c | 85 +++++++++++++++++ 7 files changed, 274 insertions(+), 246 deletions(-) diff --git a/drivers/network/dd/e1000/CMakeLists.txt b/drivers/network/dd/e1000/CMakeLists.txt index 8bb4aa25ccf..cd67a525a9d 100644 --- a/drivers/network/dd/e1000/CMakeLists.txt +++ b/drivers/network/dd/e1000/CMakeLists.txt @@ -12,7 +12,8 @@ list(APPEND SOURCE nic.h e1000hw.h debug.c - debug.h) + debug.h + send.c) add_library(e1000 MODULE ${SOURCE} e1000.rc) add_pch(e1000 nic.h SOURCE) diff --git a/drivers/network/dd/e1000/hardware.c b/drivers/network/dd/e1000/hardware.c index aa5fc26896b..c0c41ce9403 100644 --- a/drivers/network/dd/e1000/hardware.c +++ b/drivers/network/dd/e1000/hardware.c @@ -53,32 +53,6 @@ static USHORT SupportedDevices[] = 0x10B5, // Intel 82546GB Quad Copper KSP3 }; - -static ULONG E1000WriteFlush(IN PE1000_ADAPTER Adapter) -{ - volatile ULONG Value; - - NdisReadRegisterUlong(Adapter->IoBase + E1000_REG_STATUS, &Value); - return Value; -} - -VOID NTAPI E1000WriteUlong(IN PE1000_ADAPTER Adapter, IN ULONG Address, IN ULONG Value) -{ - NdisWriteRegisterUlong((PULONG)(Adapter->IoBase + Address), Value); -} - -VOID NTAPI E1000ReadUlong(IN PE1000_ADAPTER Adapter, IN ULONG Address, OUT PULONG Value) -{ - NdisReadRegisterUlong((PULONG)(Adapter->IoBase + Address), Value); -} - -static VOID E1000WriteIoUlong(IN PE1000_ADAPTER Adapter, IN ULONG Address, IN ULONG Value) -{ - NdisRawWritePortUlong((PULONG)(Adapter->IoPort), Address); - E1000WriteFlush(Adapter); - NdisRawWritePortUlong((PULONG)(Adapter->IoPort + 4), Value); -} - static ULONG PacketFilterToMask(ULONG PacketFilter) { ULONG FilterMask = 0; @@ -145,16 +119,11 @@ static BOOLEAN E1000ReadMdic(IN PE1000_ADAPTER Adapter, IN ULONG Address, USHORT ULONG Mdic; UINT n; - if (Address > MAX_PHY_REG_ADDRESS) - { - NDIS_DbgPrint(MIN_TRACE, ("PHY Address %d is invalid\n", Address)); - return 1; - } + ASSERT(Address <= MAX_PHY_REG_ADDRESS) Mdic = (Address << E1000_MDIC_REGADD_SHIFT); Mdic |= (E1000_MDIC_PHYADD_GIGABIT << E1000_MDIC_PHYADD_SHIFT); Mdic |= E1000_MDIC_OP_READ; - E1000WriteUlong(Adapter, E1000_REG_MDIC, Mdic); for (n = 0; n < MAX_PHY_READ_ATTEMPTS; n++) @@ -725,6 +694,7 @@ NICUpdateMulticastList( UINT n; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + // FIXME: Use 'Adapter->MulticastListSize'? Check the datasheet for (n = 0; n < MAXIMUM_MULTICAST_ADDRESSES; ++n) { ULONG Ral = *(ULONG *)Adapter->MulticastList[n].MacAddress; @@ -763,46 +733,6 @@ NICApplyPacketFilter( return NDIS_STATUS_SUCCESS; } -NDIS_STATUS -NTAPI -NICApplyInterruptMask( - IN PE1000_ADAPTER Adapter) -{ - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - E1000WriteUlong(Adapter, E1000_REG_IMS, Adapter->InterruptMask /*| 0x1F6DC*/); - return NDIS_STATUS_SUCCESS; -} - -NDIS_STATUS -NTAPI -NICDisableInterrupts( - IN PE1000_ADAPTER Adapter) -{ - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - E1000WriteUlong(Adapter, E1000_REG_IMC, ~0); - return NDIS_STATUS_SUCCESS; -} - -ULONG -NTAPI -NICInterruptRecognized( - IN PE1000_ADAPTER Adapter, - OUT PBOOLEAN InterruptRecognized) -{ - ULONG Value; - - /* Reading the interrupt acknowledges them */ - E1000ReadUlong(Adapter, E1000_REG_ICR, &Value); - - *InterruptRecognized = (Value & Adapter->InterruptMask) != 0; - - NDIS_DbgPrint(MAX_TRACE, ("NICInterruptRecognized(0x%x, 0x%x).\n", Value, *InterruptRecognized)); - - return (Value & Adapter->InterruptMask); -} - VOID NTAPI NICUpdateLinkStatus( @@ -819,36 +749,3 @@ NICUpdateLinkStatus( SpeedIndex = (DeviceStatus & E1000_STATUS_SPEEDMASK) >> E1000_STATUS_SPEEDSHIFT; Adapter->LinkSpeedMbps = SpeedValues[SpeedIndex]; } - -NDIS_STATUS -NTAPI -NICTransmitPacket( - IN PE1000_ADAPTER Adapter, - IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG Length) -{ - volatile PE1000_TRANSMIT_DESCRIPTOR TransmitDescriptor; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - TransmitDescriptor = Adapter->TransmitDescriptors + Adapter->CurrentTxDesc; - TransmitDescriptor->Address = PhysicalAddress.QuadPart; - TransmitDescriptor->Length = Length; - TransmitDescriptor->ChecksumOffset = 0; - TransmitDescriptor->Command = E1000_TDESC_CMD_RS | E1000_TDESC_CMD_IFCS | E1000_TDESC_CMD_EOP | E1000_TDESC_CMD_IDE; - TransmitDescriptor->Status = 0; - TransmitDescriptor->ChecksumStartField = 0; - TransmitDescriptor->Special = 0; - - Adapter->CurrentTxDesc = (Adapter->CurrentTxDesc + 1) % NUM_TRANSMIT_DESCRIPTORS; - - E1000WriteUlong(Adapter, E1000_REG_TDT, Adapter->CurrentTxDesc); - - if (Adapter->CurrentTxDesc == Adapter->LastTxDesc) - { - NDIS_DbgPrint(MID_TRACE, ("All TX descriptors are full now\n")); - Adapter->TxFull = TRUE; - } - - return NDIS_STATUS_SUCCESS; -} diff --git a/drivers/network/dd/e1000/info.c b/drivers/network/dd/e1000/info.c index 42b7fe8f2c8..9a5b632d56c 100644 --- a/drivers/network/dd/e1000/info.c +++ b/drivers/network/dd/e1000/info.c @@ -10,7 +10,7 @@ #include <debug.h> -static ULONG SupportedOidList[] = +static NDIS_OID SupportedOidList[] = { OID_GEN_SUPPORTED_LIST, OID_GEN_CURRENT_PACKET_FILTER, @@ -37,14 +37,36 @@ static ULONG SupportedOidList[] = OID_802_3_PERMANENT_ADDRESS, OID_802_3_CURRENT_ADDRESS, OID_802_3_MAXIMUM_LIST_SIZE, + /* Statistics */ OID_GEN_XMIT_OK, OID_GEN_RCV_OK, OID_GEN_XMIT_ERROR, OID_GEN_RCV_ERROR, OID_GEN_RCV_NO_BUFFER, + + OID_PNP_CAPABILITIES, }; +static +ULONG64 +NICQueryStatisticCounter( + _In_ PE1000_ADAPTER Adapter, + _In_ NDIS_OID Oid) +{ + /* TODO */ + return 0; +} + +static +NDIS_STATUS +NICFillPowerManagementCapabilities( + _In_ PE1000_ADAPTER Adapter, + _Out_ PNDIS_PNP_CAPABILITIES Capabilities) +{ + /* TODO */ + return NDIS_STATUS_NOT_SUPPORTED; +} NDIS_STATUS NTAPI @@ -57,13 +79,20 @@ MiniportQueryInformation( OUT PULONG BytesNeeded) { PE1000_ADAPTER Adapter = (PE1000_ADAPTER)MiniportAdapterContext; - ULONG genericUlong; ULONG copyLength; PVOID copySource; NDIS_STATUS status; + union _GENERIC_INFORMATION + { + USHORT Ushort; + ULONG Ulong; + ULONG64 Ulong64; + NDIS_MEDIUM Medium; + NDIS_PNP_CAPABILITIES PmCapabilities; + } GenericInfo; status = NDIS_STATUS_SUCCESS; - copySource = &genericUlong; + copySource = &GenericInfo; copyLength = sizeof(ULONG); switch (Oid) @@ -74,20 +103,19 @@ MiniportQueryInformation( break; case OID_GEN_CURRENT_PACKET_FILTER: - genericUlong = Adapter->PacketFilter; + GenericInfo.Ulong = Adapter->PacketFilter; break; case OID_GEN_HARDWARE_STATUS: UNIMPLEMENTED_DBGBREAK(); - genericUlong = (ULONG)NdisHardwareStatusReady; //FIXME + GenericInfo.Ulong = (ULONG)NdisHardwareStatusReady; //FIXME break; case OID_GEN_MEDIA_SUPPORTED: case OID_GEN_MEDIA_IN_USE: { - static const NDIS_MEDIUM medium = NdisMedium802_3; - copySource = (PVOID)&medium; - copyLength = sizeof(medium); + GenericInfo.Medium = NdisMedium802_3; + copyLength = sizeof(NDIS_MEDIUM); break; } @@ -96,31 +124,36 @@ MiniportQueryInformation( case OID_GEN_CURRENT_LOOKAHEAD: case OID_GEN_MAXIMUM_LOOKAHEAD: case OID_GEN_MAXIMUM_FRAME_SIZE: - genericUlong = MAXIMUM_FRAME_SIZE - sizeof(ETH_HEADER); + GenericInfo.Ulong = MAXIMUM_FRAME_SIZE - sizeof(ETH_HEADER); + break; + + case OID_802_3_MULTICAST_LIST: + copySource = Adapter->MulticastList; + copyLength = Adapter->MulticastListSize * IEEE_802_ADDR_LENGTH; break; case OID_802_3_MAXIMUM_LIST_SIZE: - genericUlong = MAXIMUM_MULTICAST_ADDRESSES; + GenericInfo.Ulong = MAXIMUM_MULTICAST_ADDRESSES; break; case OID_GEN_LINK_SPEED: - genericUlong = Adapter->LinkSpeedMbps * 10000; + GenericInfo.Ulong = Adapter->LinkSpeedMbps * 10000; break; case OID_GEN_TRANSMIT_BUFFER_SPACE: - genericUlong = MAXIMUM_FRAME_SIZE; + GenericInfo.Ulong = MAXIMUM_FRAME_SIZE; break; case OID_GEN_RECEIVE_BUFFER_SPACE: - genericUlong = RECEIVE_BUFFER_SIZE; + GenericInfo.Ulong = RECEIVE_BUFFER_SIZE; break; case OID_GEN_VENDOR_ID: /* The 3 bytes of the MAC address is the vendor ID */ - genericUlong = 0; - genericUlong |= (Adapter->PermanentMacAddress[0] << 16); - genericUlong |= (Adapter->PermanentMacAddress[1] << 8); - genericUlong |= (Adapter->PermanentMacAddress[2] & 0xFF); + GenericInfo.Ulong = 0; + GenericInfo.Ulong |= (Adapter->PermanentMacAddress[0] << 16); + GenericInfo.Ulong |= (Adapter->PermanentMacAddress[1] << 8); + GenericInfo.Ulong |= (Adapter->PermanentMacAddress[2] & 0xFF); break; case OID_GEN_VENDOR_DESCRIPTION: @@ -132,38 +165,35 @@ MiniportQueryInformation( } case OID_GEN_VENDOR_DRIVER_VERSION: - genericUlong = DRIVER_VERSION; + GenericInfo.Ulong = DRIVER_VERSION; break; case OID_GEN_DRIVER_VERSION: { - static const USHORT driverVersion = - (NDIS_MINIPORT_MAJOR_VERSION << 8) + NDIS_MINIPORT_MINOR_VERSION; - copySource = (PVOID)&driverVersion; - copyLength = sizeof(driverVersion); + copyLength = sizeof(USHORT); + GenericInfo.Ushort = (NDIS_MINIPORT_MAJOR_VERSION << 8) + NDIS_MINIPORT_MINOR_VERSION; break; } case OID_GEN_MAXIMUM_TOTAL_SIZE: - genericUlong = MAXIMUM_FRAME_SIZE; + GenericInfo.Ulong = MAXIMUM_FRAME_SIZE; break; case OID_GEN_MAXIMUM_SEND_PACKETS: - genericUlong = 1; + GenericInfo.Ulong = 1; break; case OID_GEN_MAC_OPTIONS: - genericUlong = NDIS_MAC_OPTION_RECEIVE_SERIALIZED | + GenericInfo.Ulong = NDIS_MAC_OPTION_RECEIVE_SERIALIZED | NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA | NDIS_MAC_OPTION_TRANSFERS_NOT_PEND | NDIS_MAC_OPTION_NO_LOOPBACK; break; case OID_GEN_MEDIA_CONNECT_STATUS: - genericUlong = Adapter->MediaState; + GenericInfo.Ulong = Adapter->MediaState; break; - case OID_802_3_CURRENT_ADDRESS: copySource = Adapter->MulticastList[0].MacAddress; copyLength = IEEE_802_ADDR_LENGTH; @@ -175,20 +205,39 @@ MiniportQueryInformation( break; case OID_GEN_XMIT_OK: - genericUlong = 0; - break; case OID_GEN_RCV_OK: - genericUlong = 0; - break; case OID_GEN_XMIT_ERROR: - genericUlong = 0; - break; case OID_GEN_RCV_ERROR: - genericUlong = 0; - break; case OID_GEN_RCV_NO_BUFFER: - genericUlong = 0; + { + GenericInfo.Ulong64 = NICQueryStatisticCounter(Adapter, Oid); + + *BytesNeeded = sizeof(ULONG64); + if (InformationBufferLength >= sizeof(ULONG64)) + { + *BytesWritten = sizeof(ULONG64); + NdisMoveMemory(InformationBuffer, copySource, sizeof(ULONG64)); + } + else if (InformationBufferLength >= sizeof(ULONG)) + { + *BytesWritten = sizeof(ULONG); + NdisMoveMemory(InformationBuffer, copySource, sizeof(ULONG)); + } + else + { + *BytesWritten = 0; + return NDIS_STATUS_BUFFER_TOO_SHORT; + } + return NDIS_STATUS_SUCCESS; + } + + case OID_PNP_CAPABILITIES: + { + copyLength = sizeof(NDIS_PNP_CAPABILITIES); + + status = NICFillPowerManagementCapabilities(Adapter, &GenericInfo.PmCapabilities); break; + } default: NDIS_DbgPrint(MIN_TRACE, ("Unknown OID 0x%x(%s)\n", Oid, Oid2Str(Oid))); @@ -202,7 +251,7 @@ MiniportQueryInformation( { *BytesNeeded = copyLength; *BytesWritten = 0; - status = NDIS_STATUS_INVALID_LENGTH; + status = NDIS_STATUS_BUFFER_TOO_SHORT; } else { @@ -217,13 +266,8 @@ MiniportQueryInformation( *BytesNeeded = 0; } - /* XMIT_ERROR and RCV_ERROR are really noisy, so do not log those. */ - if (Oid != OID_GEN_XMIT_ERROR && Oid != OID_GEN_RCV_ERROR) - { - NDIS_DbgPrint(MAX_TRACE, ("Query OID 0x%x(%s): Completed with status 0x%x (%d, %d)\n", - Oid, Oid2Str(Oid), status, *BytesWritten, *BytesNeeded)); - } - + NDIS_DbgPrint(MAX_TRACE, ("Query OID 0x%x(%s): Completed with status 0x%x (%d, %d)\n", + Oid, Oid2Str(Oid), status, *BytesWritten, *BytesNeeded)); return status; } @@ -257,12 +301,12 @@ MiniportSetInformation( NdisMoveMemory(&genericUlong, InformationBuffer, sizeof(ULONG)); if (genericUlong & - (NDIS_PACKET_TYPE_SOURCE_ROUTING | - NDIS_PACKET_TYPE_SMT | - NDIS_PACKET_TYPE_ALL_LOCAL | - NDIS_PACKET_TYPE_GROUP | - NDIS_PACKET_TYPE_ALL_FUNCTIONAL | - NDIS_PACKET_TYPE_FUNCTIONAL)) + ~(NDIS_PACKET_TYPE_DIRECTED | + NDIS_PACKET_TYPE_MULTICAST | + NDIS_PACKET_TYPE_ALL_MULTICAST | + NDIS_PACKET_TYPE_BROADCAST | + NDIS_PACKET_TYPE_PROMISCUOUS | + NDIS_PACKET_TYPE_MAC_FRAME)) { *BytesRead = sizeof(ULONG); *BytesNeeded = sizeof(ULONG); @@ -270,6 +314,11 @@ MiniportSetInformation( break; } + if (Adapter->PacketFilter == genericUlong) + { + break; + } + Adapter->PacketFilter = genericUlong; status = NICApplyPacketFilter(Adapter); @@ -312,15 +361,18 @@ MiniportSetInformation( break; } - if (InformationBufferLength / 6 > MAXIMUM_MULTICAST_ADDRESSES) + if (InformationBufferLength > sizeof(Adapter->MulticastList)) { - *BytesNeeded = MAXIMUM_MULTICAST_ADDRESSES * IEEE_802_ADDR_LENGTH; + *BytesNeeded = sizeof(Adapter->MulticastList); *BytesRead = 0; - status = NDIS_STATUS_INVALID_LENGTH; + status = NDIS_STATUS_MULTICAST_FULL; break; } NdisMoveMemory(Adapter->MulticastList, InformationBuffer, InformationBufferLength); + + Adapter->MulticastListSize = InformationBufferLength / IEEE_802_ADDR_LENGTH; + NICUpdateMulticastList(Adapter); break; diff --git a/drivers/network/dd/e1000/interrupt.c b/drivers/network/dd/e1000/interrupt.c index e3f1b83da98..e4ab64d353f 100644 --- a/drivers/network/dd/e1000/interrupt.c +++ b/drivers/network/dd/e1000/interrupt.c @@ -21,18 +21,24 @@ MiniportISR( ULONG Value; PE1000_ADAPTER Adapter = (PE1000_ADAPTER)MiniportAdapterContext; - Value = NICInterruptRecognized(Adapter, InterruptRecognized); - InterlockedOr(&Adapter->InterruptPending, Value); + /* Reading the interrupt acknowledges them */ + E1000ReadUlong(Adapter, E1000_REG_ICR, &Value); - if (!(*InterruptRecognized)) + Value &= Adapter->InterruptMask; + _InterlockedOr(&Adapter->InterruptPending, Value); + + if (Value) + { + *InterruptRecognized = TRUE; + /* Mark the events pending service */ + *QueueMiniportHandleInterrupt = TRUE; + } + else { /* This is not ours. */ + *InterruptRecognized = FALSE; *QueueMiniportHandleInterrupt = FALSE; - return; } - - /* Mark the events pending service */ - *QueueMiniportHandleInterrupt = TRUE; } VOID @@ -46,7 +52,7 @@ MiniportHandleInterrupt( NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - InterruptPending = InterlockedExchange(&Adapter->InterruptPending, 0); + InterruptPending = _InterlockedExchange(&Adapter->InterruptPending, 0); /* Link State Changed */ @@ -101,6 +107,12 @@ MiniportHandleInterrupt( NDIS_DbgPrint(MIN_TRACE, ("Unrecognized ReceiveDescriptor status flag: %u\n", ReceiveDescriptor->Status)); } + /* Make sure the receive indications are enabled */ + if (!Adapter->PacketFilter) + { + goto NextReceiveDescriptor; + } + if (ReceiveDescriptor->Length != 0 && ReceiveDescriptor->Address != 0) { EthHeader = (PETH_HEADER)(Adapter->ReceiveBuffer + BufferOffset); @@ -120,6 +132,7 @@ MiniportHandleInterrupt( NDIS_DbgPrint(MIN_TRACE, ("Got a NULL descriptor")); } +NextReceiveDescriptor: /* Give the descriptor back */ ReceiveDescriptor->Status = 0; diff --git a/drivers/network/dd/e1000/ndis.c b/drivers/network/dd/e1000/ndis.c index d6074cb5a2c..fedbd8ec4bb 100644 --- a/drivers/network/dd/e1000/ndis.c +++ b/drivers/network/dd/e1000/ndis.c @@ -23,44 +23,6 @@ MiniportReset( return NDIS_STATUS_FAILURE; } -NDIS_STATUS -NTAPI -MiniportSend( - IN NDIS_HANDLE MiniportAdapterContext, - IN PNDIS_PACKET Packet, - IN UINT Flags) -{ - PE1000_ADAPTER Adapter = (PE1000_ADAPTER)MiniportAdapterContext; - PSCATTER_GATHER_LIST sgList = NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, ScatterGatherListPacketInfo); - ULONG TransmitLength; - PHYSICAL_ADDRESS TransmitBuffer; - NDIS_STATUS Status; - - ASSERT(sgList != NULL); - ASSERT(sgList->NumberOfElements == 1); - ASSERT((sgList->Elements[0].Address.LowPart & 3) == 0); - ASSERT(sgList->Elements[0].Length <= MAXIMUM_FRAME_SIZE); - - if (Adapter->TxFull) - { - NDIS_DbgPrint(MIN_TRACE, ("All TX descriptors are full\n")); - return NDIS_STATUS_RESOURCES; - } - - TransmitLength = sgList->Elements[0].Length; - TransmitBuffer = sgList->Elements[0].Address; - Adapter->TransmitPackets[Adapter->CurrentTxDesc] = Packet; - - Status = NICTransmitPacket(Adapter, TransmitBuffer, TransmitLength); - if (Status != NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MIN_TRACE, ("Transmit packet failed\n")); - return Status; - } - - return NDIS_STATUS_PENDING; -} - VOID NTAPI MiniportHalt( @@ -264,12 +226,7 @@ MiniportInitialize( /* Enable interrupts on the NIC */ Adapter->InterruptMask = DEFAULT_INTERRUPT_MASK; - Status = NICApplyInterruptMask(Adapter); - if (Status != NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to apply interrupt mask (0x%x)\n", Status)); - goto Cleanup; - } + NICApplyInterruptMask(Adapter); /* Turn on TX and RX now */ Status = NICEnableTxRx(Adapter); diff --git a/drivers/network/dd/e1000/nic.h b/drivers/network/dd/e1000/nic.h index c1bd82997fc..32b1c888b7f 100644 --- a/drivers/network/dd/e1000/nic.h +++ b/drivers/network/dd/e1000/nic.h @@ -26,6 +26,11 @@ typedef struct _E1000_ADAPTER { + /* NIC Memory */ + volatile PUCHAR IoBase; + NDIS_PHYSICAL_ADDRESS IoAddress; + ULONG IoLength; + // NDIS_SPIN_LOCK AdapterLock; NDIS_HANDLE AdapterHandle; @@ -35,9 +40,11 @@ typedef struct _E1000_ADAPTER USHORT SubsystemVendorID; UCHAR PermanentMacAddress[IEEE_802_ADDR_LENGTH]; + struct { UCHAR MacAddress[IEEE_802_ADDR_LENGTH]; } MulticastList[MAXIMUM_MULTICAST_ADDRESSES]; + ULONG MulticastListSize; ULONG LinkSpeedMbps; ULONG MediaState; @@ -48,11 +55,6 @@ typedef struct _E1000_ADAPTER ULONG IoPortLength; volatile PUCHAR IoPort; - /* NIC Memory */ - NDIS_PHYSICAL_ADDRESS IoAddress; - ULONG IoLength; - volatile PUCHAR IoBase; - /* Interrupt */ ULONG InterruptVector; ULONG InterruptLevel; @@ -63,7 +65,9 @@ typedef struct _E1000_ADAPTER BOOLEAN InterruptRegistered; LONG InterruptMask; - LONG InterruptPending; + + _Interlocked_ + volatile LONG InterruptPending; /* Transmit */ @@ -156,22 +160,6 @@ NTAPI NICApplyPacketFilter( IN PE1000_ADAPTER Adapter); -NDIS_STATUS -NTAPI -NICApplyInterruptMask( - IN PE1000_ADAPTER Adapter); - -NDIS_STATUS -NTAPI -NICDisableInterrupts( - IN PE1000_ADAPTER Adapter); - -ULONG -NTAPI -NICInterruptRecognized( - IN PE1000_ADAPTER Adapter, - OUT PBOOLEAN InterruptRecognized); - VOID NTAPI NICUpdateLinkStatus( @@ -179,10 +167,10 @@ NICUpdateLinkStatus( NDIS_STATUS NTAPI -NICTransmitPacket( - IN PE1000_ADAPTER Adapter, - IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG Length); +MiniportSend( + _In_ NDIS_HANDLE MiniportAdapterContext, + _In_ PNDIS_PACKET Packet, + _In_ UINT Flags); NDIS_STATUS NTAPI @@ -216,19 +204,54 @@ NTAPI MiniportHandleInterrupt( IN NDIS_HANDLE MiniportAdapterContext); - +FORCEINLINE VOID -NTAPI E1000ReadUlong( - IN PE1000_ADAPTER Adapter, - IN ULONG Address, - OUT PULONG Value); + _In_ PE1000_ADAPTER Adapter, + _In_ ULONG Address, + _Out_ PULONG Value) +{ + NdisReadRegisterUlong((PULONG)(Adapter->IoBase + Address), Value); +} +FORCEINLINE VOID -NTAPI E1000WriteUlong( - IN PE1000_ADAPTER Adapter, - IN ULONG Address, - IN ULONG Value); + _In_ PE1000_ADAPTER Adapter, + _In_ ULONG Address, + _In_ ULONG Value) +{ + NdisWriteRegisterUlong((PULONG)(Adapter->IoBase + Address), Value); +} + +FORCEINLINE +VOID +E1000WriteIoUlong( + _In_ PE1000_ADAPTER Adapter, + _In_ ULONG Address, + _In_ ULONG Value) +{ + volatile ULONG Dummy; + + NdisRawWritePortUlong((PULONG)(Adapter->IoPort), Address); + NdisReadRegisterUlong(Adapter->IoBase + E1000_REG_STATUS, &Dummy); + NdisRawWritePortUlong((PULONG)(Adapter->IoPort + 4), Value); +} + +FORCEINLINE +VOID +NICApplyInterruptMask( + _In_ PE1000_ADAPTER Adapter) +{ + E1000WriteUlong(Adapter, E1000_REG_IMS, Adapter->InterruptMask /*| 0x1F6DC*/); +} + +FORCEINLINE +VOID +NICDisableInterrupts( + _In_ PE1000_ADAPTER Adapter) +{ + E1000WriteUlong(Adapter, E1000_REG_IMC, ~0); +} #endif /* _E1000_PCH_ */ diff --git a/drivers/network/dd/e1000/send.c b/drivers/network/dd/e1000/send.c new file mode 100644 index 00000000000..990e8b313d2 --- /dev/null +++ b/drivers/network/dd/e1000/send.c @@ -0,0 +1,85 @@ +/* + * PROJECT: ReactOS Intel PRO/1000 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) + * PURPOSE: Sending packets + * COPYRIGHT: Copyright 2018 Mark Jansen <mark.jansen(a)reactos.org> + * Copyright 2019 Victor Perevertkin <victor.perevertkin(a)reactos.org> + */ + +#include "nic.h" + +#include <debug.h> + +static +NDIS_STATUS +NICTransmitPacket( + _In_ PE1000_ADAPTER Adapter, + _In_ PHYSICAL_ADDRESS PhysicalAddress, + _In_ ULONG Length) +{ + volatile PE1000_TRANSMIT_DESCRIPTOR TransmitDescriptor; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + TransmitDescriptor = Adapter->TransmitDescriptors + Adapter->CurrentTxDesc; + TransmitDescriptor->Address = PhysicalAddress.QuadPart; + TransmitDescriptor->Length = Length; + TransmitDescriptor->ChecksumOffset = 0; + TransmitDescriptor->Command = E1000_TDESC_CMD_RS | E1000_TDESC_CMD_IFCS | + E1000_TDESC_CMD_EOP | E1000_TDESC_CMD_IDE; + TransmitDescriptor->Status = 0; + TransmitDescriptor->ChecksumStartField = 0; + TransmitDescriptor->Special = 0; + + Adapter->CurrentTxDesc = (Adapter->CurrentTxDesc + 1) % NUM_TRANSMIT_DESCRIPTORS; + + E1000WriteUlong(Adapter, E1000_REG_TDT, Adapter->CurrentTxDesc); + + if (Adapter->CurrentTxDesc == Adapter->LastTxDesc) + { + NDIS_DbgPrint(MID_TRACE, ("All TX descriptors are full now\n")); + Adapter->TxFull = TRUE; + } + + return NDIS_STATUS_SUCCESS; +} + +NDIS_STATUS +NTAPI +MiniportSend( + _In_ NDIS_HANDLE MiniportAdapterContext, + _In_ PNDIS_PACKET Packet, + _In_ UINT Flags) +{ + PE1000_ADAPTER Adapter = (PE1000_ADAPTER)MiniportAdapterContext; + PSCATTER_GATHER_LIST sgList; + ULONG TransmitLength; + PHYSICAL_ADDRESS TransmitBuffer; + NDIS_STATUS Status; + + sgList = NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, ScatterGatherListPacketInfo); + + ASSERT(sgList != NULL); + ASSERT(sgList->NumberOfElements == 1); + ASSERT((sgList->Elements[0].Address.LowPart & 3) == 0); + ASSERT(sgList->Elements[0].Length <= MAXIMUM_FRAME_SIZE); + + if (Adapter->TxFull) + { + NDIS_DbgPrint(MIN_TRACE, ("All TX descriptors are full\n")); + return NDIS_STATUS_RESOURCES; + } + + TransmitLength = sgList->Elements[0].Length; + TransmitBuffer = sgList->Elements[0].Address; + Adapter->TransmitPackets[Adapter->CurrentTxDesc] = Packet; + + Status = NICTransmitPacket(Adapter, TransmitBuffer, TransmitLength); + if (Status != NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MIN_TRACE, ("Transmit packet failed\n")); + return Status; + } + + return NDIS_STATUS_PENDING; +}

1 0

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

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 December 2021