Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 72442: [FREELDR] Fix a regression introduced in r70687. Dedicated to Sylvain Deverre.
by akhaldi＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: akhaldi Date: Tue Aug 23 19:20:44 2016 New Revision: 72442 URL: http://svn.reactos.org/svn/reactos?rev=72442&view=rev Log: [FREELDR] Fix a regression introduced in r70687. Dedicated to Sylvain Deverre. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Tue Aug 23 19:20:44 2016 @@ -1,7 +1,7 @@ if(SEPARATE_DBG) # FIXME: http://sourceware.org/bugzilla/show_bug.cgi?id=11822 - set(CMAKE_LDR_PE_HELPER_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_LDR_PE_HELPER_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") endif()

1 0

[akhaldi] 72441: [WINMINE] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: akhaldi Date: Tue Aug 23 19:08:37 2016 New Revision: 72441 URL: http://svn.reactos.org/svn/reactos?rev=72441&view=rev Log: [WINMINE] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/base/applications/games/winmine/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] Tue Aug 23 19:08:37 2016 @@ -312,10 +312,8 @@ p_board->face_bmp = SMILE_BMP; p_board->time = 0; - wnd_rect.left = p_board->pos.x; - wnd_rect.right = p_board->pos.x + p_board->width; - wnd_rect.top = p_board->pos.y; - wnd_rect.bottom = p_board->pos.y + p_board->height; + SetRect(&wnd_rect, p_board->pos.x, p_board->pos.y, p_board->pos.x + p_board->width, + p_board->pos.y + p_board->height); AdjustWindowRect(&wnd_rect, wnd_style, TRUE); /* Make sure the window is completely on the screen */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Aug 23 19:08:37 2016 @@ -235,7 +235,7 @@ reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.16 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.11 -reactos/base/applications/games/winmine # Synced to WineStaging-1.9.11 with our own resources. +reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-1.9.11 reactos/base/applications/iexplore # Synced to WineStaging-1.9.11 reactos/base/applications/notepad # Forked at Wine-20041201

1 0

[gadamopoulos] 72440: [EXPLORER] - CTrayWindow: Reorganise the code in logical groups to make it more readable. Move command handlers at the top of the file followed by the code that manages moving...
by gadamopoulos＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: gadamopoulos Date: Tue Aug 23 16:52:05 2016 New Revision: 72440 URL: http://svn.reactos.org/svn/reactos?rev=72440&view=rev Log: [EXPLORER] - CTrayWindow: Reorganise the code in logical groups to make it more readable. Move command handlers at the top of the file followed by the code that manages moving and resizing the taskbar. After that is code that paints the taskbar and the implementation of the ITrayWindow interface which I really doubt if it is needed. Finally at the bottom are the message handlers. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Tue Aug 23 16:52:05 2016 @@ -502,1135 +502,95 @@ PostQuitMessage(0); } - /* - * ITrayWindow + + + + + /********************************************************** + * ##### command handling ##### */ - BOOL UpdateNonClientMetrics() - { - NONCLIENTMETRICS ncm; - ncm.cbSize = sizeof(ncm); - if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) - { - if (m_Font != NULL) - DeleteObject(m_Font); - - m_Font = CreateFontIndirect(&ncm.lfMessageFont); - return TRUE; - } - - return FALSE; - } - - VOID SetWindowsFont() - { - if (m_TrayNotify != NULL) - { - SendMessage(m_TrayNotify, WM_SETFONT, (WPARAM) m_Font, TRUE); - } - } - - HMONITOR GetScreenRectFromRect( - IN OUT RECT *pRect, - IN DWORD dwFlags) - { - MONITORINFO mi; - HMONITOR hMon; - - mi.cbSize = sizeof(mi); - hMon = MonitorFromRect(pRect, dwFlags); - if (hMon != NULL && - GetMonitorInfo(hMon, &mi)) - { - *pRect = mi.rcMonitor; - } - else - { - pRect->left = 0; - pRect->top = 0; - pRect->right = GetSystemMetrics(SM_CXSCREEN); - pRect->bottom = GetSystemMetrics(SM_CYSCREEN); - - hMon = NULL; - } - - return hMon; - } - - HMONITOR GetMonitorFromRect( - IN const RECT *pRect) - { - HMONITOR hMon; - - /* In case the monitor sizes or saved sizes differ a bit (probably - not a lot, only so the tray window overlaps into another monitor - now), minimize the risk that we determine a wrong monitor by - using the center point of the tray window if we can't determine - it using the rectangle. */ - hMon = MonitorFromRect(pRect, MONITOR_DEFAULTTONULL); - if (hMon == NULL) - { - POINT pt; - - pt.x = pRect->left + ((pRect->right - pRect->left) / 2); - pt.y = pRect->top + ((pRect->bottom - pRect->top) / 2); - - /* be less error-prone, find the nearest monitor */ - hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST); - } - - return hMon; - } - - HMONITOR GetScreenRect( - IN HMONITOR hMonitor, - IN OUT RECT *pRect) - { - HMONITOR hMon = NULL; - - if (hMonitor != NULL) - { - MONITORINFO mi; - - mi.cbSize = sizeof(mi); - if (!GetMonitorInfo(hMonitor, &mi)) - { - /* Hm, the monitor is gone? Try to find a monitor where it - could be located now */ - hMon = GetMonitorFromRect(pRect); - if (hMon == NULL || - !GetMonitorInfo(hMon, &mi)) - { - hMon = NULL; - goto GetPrimaryRect; - } - } - - *pRect = mi.rcMonitor; - } - else - { -GetPrimaryRect: - pRect->left = 0; - pRect->top = 0; - pRect->right = GetSystemMetrics(SM_CXSCREEN); - pRect->bottom = GetSystemMetrics(SM_CYSCREEN); - } - - return hMon; - } - - VOID MakeTrayRectWithSize(IN DWORD Position, - IN const SIZE *pTraySize, - IN OUT RECT *pRect) - { - switch (Position) - { - case ABE_LEFT: - pRect->right = pRect->left + pTraySize->cx; - break; - - case ABE_TOP: - pRect->bottom = pRect->top + pTraySize->cy; - break; - - case ABE_RIGHT: - pRect->left = pRect->right - pTraySize->cx; - break; - - case ABE_BOTTOM: - default: - pRect->top = pRect->bottom - pTraySize->cy; - break; - } - } - - VOID GetTrayRectFromScreenRect(IN DWORD Position, - IN const RECT *pScreen, - IN const SIZE *pTraySize OPTIONAL, - OUT RECT *pRect) - { - if (pTraySize == NULL) - pTraySize = &m_TraySize; - - *pRect = *pScreen; - - /* Move the border outside of the screen */ - InflateRect(pRect, - GetSystemMetrics(SM_CXEDGE), - GetSystemMetrics(SM_CYEDGE)); - - MakeTrayRectWithSize(Position, pTraySize, pRect); - } - - BOOL IsPosHorizontal() - { - return m_Position == ABE_TOP || m_Position == ABE_BOTTOM; - } - - HMONITOR CalculateValidSize( - IN DWORD Position, - IN OUT RECT *pRect) - { - RECT rcScreen; - //BOOL Horizontal; - HMONITOR hMon; - SIZE szMax, szWnd; - - //Horizontal = IsPosHorizontal(); - - szWnd.cx = pRect->right - pRect->left; - szWnd.cy = pRect->bottom - pRect->top; - - rcScreen = *pRect; - hMon = GetScreenRectFromRect( - &rcScreen, - MONITOR_DEFAULTTONEAREST); - - /* Calculate the maximum size of the tray window and limit the window - size to half of the screen's size. */ - szMax.cx = (rcScreen.right - rcScreen.left) / 2; - szMax.cy = (rcScreen.bottom - rcScreen.top) / 2; - if (szWnd.cx > szMax.cx) - szWnd.cx = szMax.cx; - if (szWnd.cy > szMax.cy) - szWnd.cy = szMax.cy; - - /* FIXME - calculate */ - - GetTrayRectFromScreenRect(Position, - &rcScreen, - &szWnd, - pRect); - - return hMon; - } - -#if 0 - VOID - GetMinimumWindowSize( - OUT RECT *pRect) - { - RECT rcMin = {0}; - - AdjustWindowRectEx(&rcMin, - GetWindowLong(m_hWnd, - GWL_STYLE), - FALSE, - GetWindowLong(m_hWnd, - GWL_EXSTYLE)); - - *pRect = rcMin; - } -#endif - - - DWORD GetDraggingRectFromPt( - IN POINT pt, - OUT RECT *pRect, - OUT HMONITOR *phMonitor) - { - HMONITOR hMon, hMonNew; - DWORD PosH, PosV, Pos; - SIZE DeltaPt, ScreenOffset; - RECT rcScreen; - - rcScreen.left = 0; - rcScreen.top = 0; - - /* Determine the screen rectangle */ - hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL); - if (hMon != NULL) - { - MONITORINFO mi; - - mi.cbSize = sizeof(mi); - if (!GetMonitorInfo(hMon, &mi)) - { - hMon = NULL; - goto GetPrimaryScreenRect; - } - - /* make left top corner of the screen zero based to - make calculations easier */ - pt.x -= mi.rcMonitor.left; - pt.y -= mi.rcMonitor.top; - - ScreenOffset.cx = mi.rcMonitor.left; - ScreenOffset.cy = mi.rcMonitor.top; - rcScreen.right = mi.rcMonitor.right - mi.rcMonitor.left; - rcScreen.bottom = mi.rcMonitor.bottom - mi.rcMonitor.top; - } - else - { -GetPrimaryScreenRect: - ScreenOffset.cx = 0; - ScreenOffset.cy = 0; - rcScreen.right = GetSystemMetrics(SM_CXSCREEN); - rcScreen.bottom = GetSystemMetrics(SM_CYSCREEN); - } - - /* Calculate the nearest screen border */ - if (pt.x < rcScreen.right / 2) - { - DeltaPt.cx = pt.x; - PosH = ABE_LEFT; - } - else - { - DeltaPt.cx = rcScreen.right - pt.x; - PosH = ABE_RIGHT; - } - - if (pt.y < rcScreen.bottom / 2) - { - DeltaPt.cy = pt.y; - PosV = ABE_TOP; - } - else - { - DeltaPt.cy = rcScreen.bottom - pt.y; - PosV = ABE_BOTTOM; - } - - Pos = (DeltaPt.cx * rcScreen.bottom < DeltaPt.cy * rcScreen.right) ? PosH : PosV; - - /* Fix the screen origin to be relative to the primary monitor again */ - OffsetRect(&rcScreen, - ScreenOffset.cx, - ScreenOffset.cy); - - RECT rcPos = m_TrayRects[Pos]; - - hMonNew = GetMonitorFromRect(&rcPos); - if (hMon != hMonNew) - { - SIZE szTray; - - /* Recalculate the rectangle, we're dragging to another monitor. - We don't need to recalculate the rect on single monitor systems. */ - szTray.cx = rcPos.right - rcPos.left; - szTray.cy = rcPos.bottom - rcPos.top; - - GetTrayRectFromScreenRect(Pos, &rcScreen, &szTray, pRect); - if (AutoHide) - { - pRect->left += m_AutoHideOffset.cx; - pRect->right += m_AutoHideOffset.cx; - pRect->top += m_AutoHideOffset.cy; - pRect->bottom += m_AutoHideOffset.cy; - } - hMon = hMonNew; - } - else - { - /* The user is dragging the tray window on the same monitor. We don't need - to recalculate the rectangle */ - *pRect = rcPos; - if (AutoHide) - { - pRect->left += m_AutoHideOffset.cx; - pRect->right += m_AutoHideOffset.cx; - pRect->top += m_AutoHideOffset.cy; - pRect->bottom += m_AutoHideOffset.cy; - } - } - - *phMonitor = hMon; - - return Pos; - } - - DWORD GetDraggingRectFromRect( - IN OUT RECT *pRect, - OUT HMONITOR *phMonitor) - { - POINT pt; - - /* Calculate the center of the rectangle. We call - GetDraggingRectFromPt to calculate a valid - dragging rectangle */ - pt.x = pRect->left + ((pRect->right - pRect->left) / 2); - pt.y = pRect->top + ((pRect->bottom - pRect->top) / 2); - - return GetDraggingRectFromPt( - pt, - pRect, - phMonitor); - } - - VOID ChangingWinPos(IN OUT LPWINDOWPOS pwp) - { - RECT rcTray; - - if (IsDragging) - { - rcTray.left = pwp->x; - rcTray.top = pwp->y; - rcTray.right = rcTray.left + pwp->cx; - rcTray.bottom = rcTray.top + pwp->cy; - if (AutoHide) - { - rcTray.left -= m_AutoHideOffset.cx; - rcTray.right -= m_AutoHideOffset.cx; - rcTray.top -= m_AutoHideOffset.cy; - rcTray.bottom -= m_AutoHideOffset.cy; - } - - if (!EqualRect(&rcTray, - &m_TrayRects[m_DraggingPosition])) - { - /* Recalculate the rectangle, the user dragged the tray - window to another monitor or the window was somehow else - moved or resized */ - m_DraggingPosition = GetDraggingRectFromRect( - &rcTray, - &m_DraggingMonitor); - //m_TrayRects[DraggingPosition] = rcTray; - } - - //Monitor = CalculateValidSize(DraggingPosition, - // &rcTray); - - m_Monitor = m_DraggingMonitor; - m_Position = m_DraggingPosition; - IsDragging = FALSE; - - m_TrayRects[m_Position] = rcTray; - goto ChangePos; - } - else if (GetWindowRect(&rcTray)) - { - if (InSizeMove) - { - if (!(pwp->flags & SWP_NOMOVE)) - { - rcTray.left = pwp->x; - rcTray.top = pwp->y; - } - - if (!(pwp->flags & SWP_NOSIZE)) - { - rcTray.right = rcTray.left + pwp->cx; - rcTray.bottom = rcTray.top + pwp->cy; - } - - m_Position = GetDraggingRectFromRect(&rcTray, &m_Monitor); - - if (!(pwp->flags & (SWP_NOMOVE | SWP_NOSIZE))) - { - SIZE szWnd; - - szWnd.cx = pwp->cx; - szWnd.cy = pwp->cy; - - MakeTrayRectWithSize(m_Position, &szWnd, &rcTray); - } - - if (AutoHide) - { - rcTray.left -= m_AutoHideOffset.cx; - rcTray.right -= m_AutoHideOffset.cx; - rcTray.top -= m_AutoHideOffset.cy; - rcTray.bottom -= m_AutoHideOffset.cy; - } - m_TrayRects[m_Position] = rcTray; - } - else - { - /* If the user isn't resizing the tray window we need to make sure the - new size or position is valid. this is to prevent changes to the window - without user interaction. */ - rcTray = m_TrayRects[m_Position]; - } - -ChangePos: - m_TraySize.cx = rcTray.right - rcTray.left; - m_TraySize.cy = rcTray.bottom - rcTray.top; - - if (AutoHide) - { - rcTray.left += m_AutoHideOffset.cx; - rcTray.right += m_AutoHideOffset.cx; - rcTray.top += m_AutoHideOffset.cy; - rcTray.bottom += m_AutoHideOffset.cy; - } - - pwp->flags &= ~(SWP_NOMOVE | SWP_NOSIZE); - pwp->x = rcTray.left; - pwp->y = rcTray.top; - pwp->cx = m_TraySize.cx; - pwp->cy = m_TraySize.cy; - } - } - - VOID ApplyClipping(IN BOOL Clip) - { - RECT rcClip, rcWindow; - HRGN hClipRgn; - - if (GetWindowRect(&rcWindow)) - { - /* Disable clipping on systems with only one monitor */ - if (GetSystemMetrics(SM_CMONITORS) <= 1) - Clip = FALSE; - - if (Clip) - { - rcClip = rcWindow; - - GetScreenRect(m_Monitor, &rcClip); - - if (!IntersectRect(&rcClip, &rcClip, &rcWindow)) - { - rcClip = rcWindow; - } - - OffsetRect(&rcClip, - -rcWindow.left, - -rcWindow.top); - - hClipRgn = CreateRectRgnIndirect(&rcClip); - } - else - hClipRgn = NULL; - - /* Set the clipping region or make sure the window isn't clipped - by disabling it explicitly. */ - SetWindowRgn(hClipRgn, TRUE); - } - } - - VOID ResizeWorkArea() - { -#if !WIN7_DEBUG_MODE - RECT rcTray, rcWorkArea; - - /* If monitor has changed then fix the previous monitors work area */ - if (m_PreviousMonitor != m_Monitor) - { - GetScreenRect(m_PreviousMonitor, &rcWorkArea); - SystemParametersInfoW(SPI_SETWORKAREA, - 1, - &rcWorkArea, - SPIF_SENDCHANGE); - } - - rcTray = m_TrayRects[m_Position]; - - GetScreenRect(m_Monitor, &rcWorkArea); - m_PreviousMonitor = m_Monitor; - - /* If AutoHide is false then change the workarea to exclude - the area that the taskbar covers. */ - if (!AutoHide) - { - switch (m_Position) - { - case ABE_TOP: - rcWorkArea.top = rcTray.bottom; - break; - case ABE_LEFT: - rcWorkArea.left = rcTray.right; - break; - case ABE_RIGHT: - rcWorkArea.right = rcTray.left; - break; - case ABE_BOTTOM: - rcWorkArea.bottom = rcTray.top; - break; - } - } - - /* - * Resize the current monitor work area. Win32k will also send - * a WM_SIZE message to automatically resize the desktop. - */ - SystemParametersInfoW(SPI_SETWORKAREA, - 1, - &rcWorkArea, - SPIF_SENDCHANGE); -#endif - } - - VOID CheckTrayWndPosition() - { - RECT rcTray; - - rcTray = m_TrayRects[m_Position]; - - if (AutoHide) - { - rcTray.left += m_AutoHideOffset.cx; - rcTray.right += m_AutoHideOffset.cx; - rcTray.top += m_AutoHideOffset.cy; - rcTray.bottom += m_AutoHideOffset.cy; - } - - /* Move the tray window */ - SetWindowPos(NULL, - rcTray.left, - rcTray.top, - rcTray.right - rcTray.left, - rcTray.bottom - rcTray.top, - SWP_NOZORDER | SWP_NOACTIVATE); - - ResizeWorkArea(); - - ApplyClipping(TRUE); - } - - typedef struct _TW_STUCKRECTS2 - { - DWORD cbSize; - LONG Unknown; - DWORD dwFlags; - DWORD Position; - SIZE Size; - RECT Rect; - } TW_STRUCKRECTS2, *PTW_STUCKRECTS2; - - VOID RegLoadSettings() - { - DWORD Pos; - TW_STRUCKRECTS2 sr; - RECT rcScreen; - SIZE WndSize, EdgeSize, DlgFrameSize; - DWORD cbSize = sizeof(sr); - SIZE StartBtnSize = m_StartButton.GetSize(); - - EdgeSize.cx = GetSystemMetrics(SM_CXEDGE); - EdgeSize.cy = GetSystemMetrics(SM_CYEDGE); - DlgFrameSize.cx = GetSystemMetrics(SM_CXDLGFRAME); - DlgFrameSize.cy = GetSystemMetrics(SM_CYDLGFRAME); - - if (SHGetValue(hkExplorer, - TEXT("StuckRects2"), - TEXT("Settings"), - NULL, - &sr, - &cbSize) == ERROR_SUCCESS && - sr.cbSize == sizeof(sr)) - { - AutoHide = (sr.dwFlags & ABS_AUTOHIDE) != 0; - AlwaysOnTop = (sr.dwFlags & ABS_ALWAYSONTOP) != 0; - SmSmallIcons = (sr.dwFlags & 0x4) != 0; - HideClock = (sr.dwFlags & 0x8) != 0; - - /* FIXME: Are there more flags? */ - -#if WIN7_DEBUG_MODE - m_Position = ABE_LEFT; -#else - if (sr.Position > ABE_BOTTOM) - m_Position = ABE_BOTTOM; - else - m_Position = sr.Position; -#endif - - /* Try to find out which monitor the tray window was located on last. - Here we're only interested in the monitor screen that we think - is the last one used. We're going to determine on which monitor - we really are after calculating the docked position. */ - rcScreen = sr.Rect; - GetScreenRectFromRect( - &rcScreen, - MONITOR_DEFAULTTONEAREST); - } - else - { - m_Position = ABE_BOTTOM; - AlwaysOnTop = TRUE; - - /* Use the minimum size of the taskbar, we'll use the start - button as a minimum for now. Make sure we calculate the - entire window size, not just the client size. However, we - use a thinner border than a standard thick border, so that - the start button and bands are not stuck to the screen border. */ - sr.Size.cx = StartBtnSize.cx + (2 * (EdgeSize.cx + DlgFrameSize.cx)); - sr.Size.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); - - /* Use the primary screen by default */ - rcScreen.left = 0; - rcScreen.top = 0; - rcScreen.right = GetSystemMetrics(SM_CXSCREEN); - rcScreen.bottom = GetSystemMetrics(SM_CYSCREEN); - GetScreenRectFromRect( - &rcScreen, - MONITOR_DEFAULTTOPRIMARY); - } - - if (m_hWnd != NULL) - SetWindowPos( - AlwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, - 0, - 0, - 0, - 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - - /* Determine a minimum tray window rectangle. The "client" height is - zero here since we cannot determine an optimal minimum width when - loaded as a vertical tray window. We just need to make sure the values - loaded from the registry are at least. The windows explorer behaves - the same way, it allows the user to save a zero width vertical tray - window, but not a zero height horizontal tray window. */ - WndSize.cx = 2 * (EdgeSize.cx + DlgFrameSize.cx); - WndSize.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); - - if (WndSize.cx < sr.Size.cx) - WndSize.cx = sr.Size.cx; - if (WndSize.cy < sr.Size.cy) - WndSize.cy = sr.Size.cy; - - /* Save the calculated size */ - m_TraySize = WndSize; - - /* Calculate all docking rectangles. We need to do this here so they're - initialized and dragging the tray window to another position gives - usable results */ - for (Pos = ABE_LEFT; Pos <= ABE_BOTTOM; Pos++) - { - GetTrayRectFromScreenRect(Pos, - &rcScreen, - &m_TraySize, - &m_TrayRects[Pos]); - // TRACE("m_TrayRects[%d(%d)]: %d,%d,%d,%d\n", Pos, Position, m_TrayRects[Pos].left, m_TrayRects[Pos].top, m_TrayRects[Pos].right, m_TrayRects[Pos].bottom); - } - - /* Determine which monitor we are on. It shouldn't matter which docked - position rectangle we use */ - m_Monitor = GetMonitorFromRect(&m_TrayRects[ABE_LEFT]); - } - - UINT TrackMenu( - IN HMENU hMenu, - IN POINT *ppt OPTIONAL, - IN HWND hwndExclude OPTIONAL, - IN BOOL TrackUp, - IN BOOL IsContextMenu) - { - TPMPARAMS tmp, *ptmp = NULL; - POINT pt; - UINT cmdId; - UINT fuFlags; - - if (hwndExclude != NULL) - { - /* Get the client rectangle and map it to screen coordinates */ - if (::GetClientRect(hwndExclude, - &tmp.rcExclude) && - ::MapWindowPoints(hwndExclude, - NULL, - (LPPOINT) &tmp.rcExclude, - 2) != 0) - { - ptmp = &tmp; - } - } - - if (ppt == NULL) - { - if (ptmp == NULL && - GetClientRect(&tmp.rcExclude) && - MapWindowPoints( - NULL, - (LPPOINT) &tmp.rcExclude, - 2) != 0) - { - ptmp = &tmp; - } - - if (ptmp != NULL) - { - /* NOTE: TrackPopupMenuEx will eventually align the track position - for us, no need to take care of it here as long as the - coordinates are somewhere within the exclusion rectangle */ - pt.x = ptmp->rcExclude.left; - pt.y = ptmp->rcExclude.top; - } - else - pt.x = pt.y = 0; - } - else - pt = *ppt; - - tmp.cbSize = sizeof(tmp); - - fuFlags = TPM_RETURNCMD | TPM_VERTICAL; - fuFlags |= (TrackUp ? TPM_BOTTOMALIGN : TPM_TOPALIGN); - if (IsContextMenu) - fuFlags |= TPM_RIGHTBUTTON; - else - fuFlags |= (TrackUp ? TPM_VERNEGANIMATION : TPM_VERPOSANIMATION); - - cmdId = TrackPopupMenuEx(hMenu, - fuFlags, - pt.x, - pt.y, - m_hWnd, - ptmp); - - return cmdId; - } - - HRESULT TrackCtxMenu( - IN IContextMenu * contextMenu, - IN POINT *ppt OPTIONAL, - IN HWND hwndExclude OPTIONAL, - IN BOOL TrackUp, - IN PVOID Context OPTIONAL) - { - INT x = ppt->x; - INT y = ppt->y; - HRESULT hr; - UINT uCommand; - HMENU popup = CreatePopupMenu(); - - if (popup == NULL) + HRESULT ExecResourceCmd(int id) + { + WCHAR szCommand[256]; + WCHAR *pszParameters; + + if (!LoadStringW(hExplorerInstance, + id, + szCommand, + _countof(szCommand))) + { return E_FAIL; - - TRACE("Before Query\n"); - hr = contextMenu->QueryContextMenu(popup, 0, 0, UINT_MAX, CMF_NORMAL); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("Query failed\n"); - DestroyMenu(popup); - return hr; - } - - TRACE("Before Tracking\n"); - uCommand = ::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, m_hWnd, NULL); - - if (uCommand != 0) - { - TRACE("Before InvokeCommand\n"); - CMINVOKECOMMANDINFO cmi = { 0 }; - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = MAKEINTRESOURCEA(uCommand); - cmi.hwnd = m_hWnd; - hr = contextMenu->InvokeCommand(&cmi); - } - else - { - TRACE("TrackPopupMenu failed. Code=%d, LastError=%d\n", uCommand, GetLastError()); - hr = S_FALSE; - } - - DestroyMenu(popup); - return hr; - } - - VOID AlignControls(IN PRECT prcClient OPTIONAL) - { - RECT rcClient; - SIZE TraySize, StartSize; - POINT ptTrayNotify = { 0, 0 }; - BOOL Horizontal; - HDWP dwp; - - m_StartButton.UpdateSize(); - if (prcClient != NULL) - { - rcClient = *prcClient; - } - else - { - if (!GetClientRect(&rcClient)) - { - ERR("Could not get client rect lastErr=%d\n", GetLastError()); + } + + pszParameters = wcschr(szCommand, L'>'); + if (pszParameters) + { + *pszParameters = 0; + pszParameters++; + } + + ShellExecuteW(m_hWnd, NULL, szCommand, pszParameters, NULL, SW_SHOWNORMAL); + return S_OK; + } + + LRESULT DoExitWindows() + { + ExitWindowsDialog(m_hWnd); + return 0; + } + + DWORD WINAPI RunFileDlgThread() + { + HWND hwnd; + RECT posRect; + + m_StartButton.GetWindowRect(&posRect); + + hwnd = CreateWindowEx(0, + WC_STATIC, + NULL, + WS_OVERLAPPED | WS_DISABLED | WS_CLIPSIBLINGS | WS_BORDER | SS_LEFT, + posRect.left, + posRect.top, + posRect.right - posRect.left, + posRect.bottom - posRect.top, + NULL, + NULL, + NULL, + NULL); + + m_RunFileDlgOwner = hwnd; + + RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY); + + m_RunFileDlgOwner = NULL; + ::DestroyWindow(hwnd); + + return 0; + } + + static DWORD WINAPI s_RunFileDlgThread(IN OUT PVOID pParam) + { + CTrayWindow * This = (CTrayWindow*) pParam; + return This->RunFileDlgThread(); + } + + void DisplayRunFileDlg() + { + HWND hRunDlg; + if (m_RunFileDlgOwner) + { + hRunDlg = ::GetLastActivePopup(m_RunFileDlgOwner); + if (hRunDlg != NULL && + hRunDlg != m_RunFileDlgOwner) + { + SetForegroundWindow(hRunDlg); return; } } - Horizontal = IsPosHorizontal(); - - /* We're about to resize/move the start button, the rebar control and - the tray notification control */ - dwp = BeginDeferWindowPos(3); - if (dwp == NULL) - { - ERR("BeginDeferWindowPos failed. lastErr=%d\n", GetLastError()); - return; - } - - /* Limit the Start button width to the client width, if neccessary */ - StartSize = m_StartButton.GetSize(); - if (StartSize.cx > rcClient.right) - StartSize.cx = rcClient.right; - - if (m_StartButton.m_hWnd != NULL) - { - /* Resize and reposition the button */ - dwp = m_StartButton.DeferWindowPos(dwp, - NULL, - 0, - 0, - StartSize.cx, - StartSize.cy, - SWP_NOZORDER | SWP_NOACTIVATE); - if (dwp == NULL) - { - ERR("DeferWindowPos for start button failed. lastErr=%d\n", GetLastError()); - return; - } - } - - /* Determine the size that the tray notification window needs */ - if (Horizontal) - { - TraySize.cx = 0; - TraySize.cy = rcClient.bottom; - } - else - { - TraySize.cx = rcClient.right; - TraySize.cy = 0; - } - - if (m_TrayNotify != NULL && - SendMessage(m_TrayNotify, - TNWM_GETMINIMUMSIZE, - (WPARAM)Horizontal, - (LPARAM)&TraySize)) - { - /* Move the tray notification window to the desired location */ - if (Horizontal) - ptTrayNotify.x = rcClient.right - TraySize.cx; - else - ptTrayNotify.y = rcClient.bottom - TraySize.cy; - - dwp = ::DeferWindowPos(dwp, - m_TrayNotify, - NULL, - ptTrayNotify.x, - ptTrayNotify.y, - TraySize.cx, - TraySize.cy, - SWP_NOZORDER | SWP_NOACTIVATE); - if (dwp == NULL) - { - ERR("DeferWindowPos for notification area failed. lastErr=%d\n", GetLastError()); - return; - } - } - - /* Resize/Move the rebar control */ - if (m_Rebar != NULL) - { - POINT ptRebar = { 0, 0 }; - SIZE szRebar; - - SetWindowStyle(m_Rebar, CCS_VERT, Horizontal ? 0 : CCS_VERT); - - if (Horizontal) - { - ptRebar.x = StartSize.cx + GetSystemMetrics(SM_CXSIZEFRAME); - szRebar.cx = ptTrayNotify.x - ptRebar.x; - szRebar.cy = rcClient.bottom; - } - else - { - ptRebar.y = StartSize.cy + GetSystemMetrics(SM_CYSIZEFRAME); - szRebar.cx = rcClient.right; - szRebar.cy = ptTrayNotify.y - ptRebar.y; - } - - dwp = ::DeferWindowPos(dwp, - m_Rebar, - NULL, - ptRebar.x, - ptRebar.y, - szRebar.cx, - szRebar.cy, - SWP_NOZORDER | SWP_NOACTIVATE); - } - - if (dwp != NULL) - EndDeferWindowPos(dwp); - - if (m_TaskSwitch != NULL) - { - /* Update the task switch window configuration */ - SendMessage(m_TaskSwitch, TSWM_UPDATETASKBARPOS, 0, 0); - } - } - - LRESULT OnThemeChanged() - { - if (m_Theme) - CloseThemeData(m_Theme); - - if (IsThemeActive()) - m_Theme = OpenThemeData(m_hWnd, L"TaskBar"); - else - m_Theme = NULL; - - if (Locked && m_Theme) - { - SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); - } - else - { - SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); - } - SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); - - return TRUE; - } - - LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - return OnThemeChanged(); - } - - LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - ((ITrayWindow*)this)->AddRef(); - - SetWindowTheme(m_hWnd, L"TaskBar", NULL); - - InterlockedIncrement(&TrayWndCount); - - if (m_CaptionFont == NULL) - { - NONCLIENTMETRICS ncm; - - /* Get the system fonts, we use the caption font, - always bold, though. */ - ncm.cbSize = sizeof(ncm); - if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE)) - { - if (m_CaptionFont == NULL) - { - ncm.lfCaptionFont.lfWeight = FW_NORMAL; - m_CaptionFont = CreateFontIndirect(&ncm.lfCaptionFont); - } - } - } - - /* Create the Start button */ - m_StartButton.Create(m_hWnd); - - /* Load the saved tray window settings */ - RegLoadSettings(); - - /* Create and initialize the start menu */ - HBITMAP hbmBanner = LoadBitmapW(hExplorerInstance, MAKEINTRESOURCEW(IDB_STARTMENU)); - m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner, 0); - - /* Load the tray band site */ - m_TrayBandSite = CreateTrayBandSite(this, &m_Rebar, &m_TaskSwitch); - SetWindowTheme(m_Rebar, L"TaskBar", NULL); - - /* Create the tray notification window */ - m_TrayNotify = CreateTrayNotifyWnd(this, HideClock, &m_TrayNotifyInstance); - - if (UpdateNonClientMetrics()) - { - SetWindowsFont(); - } - - /* Move the tray window to the right position and resize it if neccessary */ - CheckTrayWndPosition(); - - /* Align all controls on the tray window */ - AlignControls(NULL); - - InitShellServices(&m_ShellServices); - - if (AutoHide) - { - m_AutoHideState = AUTOHIDE_HIDING; - SetTimer(TIMER_ID_AUTOHIDE, AUTOHIDE_DELAY_HIDE, NULL); - } - - RegisterHotKey(m_hWnd, IDHK_RUN, MOD_WIN, 'R'); - RegisterHotKey(m_hWnd, IDHK_MINIMIZE_ALL, MOD_WIN, 'M'); - RegisterHotKey(m_hWnd, IDHK_RESTORE_ALL, MOD_WIN|MOD_SHIFT, 'M'); - RegisterHotKey(m_hWnd, IDHK_HELP, MOD_WIN, VK_F1); - RegisterHotKey(m_hWnd, IDHK_EXPLORE, MOD_WIN, 'E'); - RegisterHotKey(m_hWnd, IDHK_FIND, MOD_WIN, 'F'); - RegisterHotKey(m_hWnd, IDHK_FIND_COMPUTER, MOD_WIN|MOD_CONTROL, 'F'); - RegisterHotKey(m_hWnd, IDHK_NEXT_TASK, MOD_WIN, VK_TAB); - RegisterHotKey(m_hWnd, IDHK_PREV_TASK, MOD_WIN|MOD_SHIFT, VK_TAB); - RegisterHotKey(m_hWnd, IDHK_SYS_PROPERTIES, MOD_WIN, VK_PAUSE); - RegisterHotKey(m_hWnd, IDHK_DESKTOP, MOD_WIN, 'D'); - RegisterHotKey(m_hWnd, IDHK_PAGER, MOD_WIN, 'B'); - - return TRUE; - } - - HRESULT STDMETHODCALLTYPE Open() - { - RECT rcWnd; - - /* Check if there's already a window created and try to show it. - If it was somehow destroyed just create a new tray window. */ - if (m_hWnd != NULL && IsWindow()) - { - if (!IsWindowVisible()) - { - CheckTrayWndPosition(); - - ShowWindow(SW_SHOW); - } - - return S_OK; - } - - DWORD dwExStyle = WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE; - if (AlwaysOnTop) - dwExStyle |= WS_EX_TOPMOST; - - DWORD dwStyle = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | - WS_BORDER | WS_THICKFRAME; - - ZeroMemory(&rcWnd, sizeof(rcWnd)); - if (m_Position != (DWORD) -1) - rcWnd = m_TrayRects[m_Position]; - - if (!Create(NULL, rcWnd, NULL, dwStyle, dwExStyle)) - return E_FAIL; - - return S_OK; - } - - HRESULT STDMETHODCALLTYPE Close() - { - if (m_hWnd != NULL) - { - SendMessage(m_hWnd, - WM_APP_TRAYDESTROY, - 0, - 0); - } - - return S_OK; - } - - HWND STDMETHODCALLTYPE GetHWND() - { - return m_hWnd; - } - - BOOL STDMETHODCALLTYPE IsSpecialHWND(IN HWND hWnd) - { - return (m_hWnd == hWnd || - (m_DesktopWnd != NULL && m_hWnd == m_DesktopWnd)); - } - - BOOL STDMETHODCALLTYPE IsHorizontal() - { - return IsPosHorizontal(); - } - - HFONT STDMETHODCALLTYPE GetCaptionFonts(OUT HFONT *phBoldCaption OPTIONAL) - { - if (phBoldCaption != NULL) - *phBoldCaption = m_StartButton.GetFont(); - - return m_CaptionFont; + CloseHandle(CreateThread(NULL, 0, s_RunFileDlgThread, this, 0, NULL)); } DWORD WINAPI TrayPropertiesThread() @@ -1718,8 +678,6 @@ BOOL STDMETHODCALLTYPE ExecContextMenuCmd(IN UINT uiCmd) { - BOOL bHandled = TRUE; - switch (uiCmd) { case ID_SHELL_CMD_PROPERTIES: @@ -1775,185 +733,1049 @@ default: TRACE("ITrayWindow::ExecContextMenuCmd(%u): Unhandled Command ID!\n", uiCmd); - bHandled = FALSE; - break; - } - - return bHandled; - } - - BOOL STDMETHODCALLTYPE Lock(IN BOOL bLock) - { - BOOL bPrevLock = Locked; - - if (Locked != bLock) - { - Locked = bLock; - - if (m_TrayBandSite != NULL) - { - if (!SUCCEEDED(m_TrayBandSite->Lock(bLock))) + return FALSE; + } + + return TRUE; + } + + LRESULT HandleHotKey(DWORD id) + { + switch (id) + { + case IDHK_RUN: + DisplayRunFileDlg(); + break; + case IDHK_HELP: + ExecResourceCmd(IDS_HELP_COMMAND); + break; + case IDHK_EXPLORE: + //FIXME: We don't support this yet: + //ShellExecuteW(0, L"explore", NULL, NULL, NULL, 1); + ShellExecuteW(0, NULL, L"explorer.exe", NULL, NULL, 1); + break; + case IDHK_FIND: + SHFindFiles(NULL, NULL); + break; + case IDHK_FIND_COMPUTER: + SHFindComputer(NULL, NULL); + break; + case IDHK_SYS_PROPERTIES: + //FIXME: Use SHRunControlPanel + ShellExecuteW(m_hWnd, NULL, L"sysdm.cpl", NULL, NULL, SW_NORMAL); + break; + case IDHK_NEXT_TASK: + break; + case IDHK_PREV_TASK: + break; + case IDHK_MINIMIZE_ALL: + break; + case IDHK_RESTORE_ALL: + break; + case IDHK_DESKTOP: + break; + case IDHK_PAGER: + break; + } + + return 0; + } + + LRESULT HandleCommand(UINT uCommand) + { + switch (uCommand) + { + case IDM_TASKBARANDSTARTMENU: + DisplayProperties(); + break; + + case IDM_SEARCH: + SHFindFiles(NULL, NULL); + break; + + case IDM_HELPANDSUPPORT: + ExecResourceCmd(IDS_HELP_COMMAND); + break; + + case IDM_RUN: + DisplayRunFileDlg(); + break; + + /* FIXME: Handle these commands as well */ + case IDM_SYNCHRONIZE: + case IDM_DISCONNECT: + case IDM_UNDOCKCOMPUTER: + break; + + case IDM_LOGOFF: + LogoffWindowsDialog(m_hWnd); // FIXME: Maybe handle it in a similar way as DoExitWindows? + break; + + case IDM_SHUTDOWN: + DoExitWindows(); + break; + } + + return FALSE; + } + + + UINT TrackMenu( + IN HMENU hMenu, + IN POINT *ppt OPTIONAL, + IN HWND hwndExclude OPTIONAL, + IN BOOL TrackUp, + IN BOOL IsContextMenu) + { + TPMPARAMS tmp, *ptmp = NULL; + POINT pt; + UINT cmdId; + UINT fuFlags; + + if (hwndExclude != NULL) + { + /* Get the client rectangle and map it to screen coordinates */ + if (::GetClientRect(hwndExclude, + &tmp.rcExclude) && + ::MapWindowPoints(hwndExclude, + NULL, + (LPPOINT) &tmp.rcExclude, + 2) != 0) + { + ptmp = &tmp; + } + } + + if (ppt == NULL) + { + if (ptmp == NULL && + GetClientRect(&tmp.rcExclude) && + MapWindowPoints( + NULL, + (LPPOINT) &tmp.rcExclude, + 2) != 0) + { + ptmp = &tmp; + } + + if (ptmp != NULL) + { + /* NOTE: TrackPopupMenuEx will eventually align the track position + for us, no need to take care of it here as long as the + coordinates are somewhere within the exclusion rectangle */ + pt.x = ptmp->rcExclude.left; + pt.y = ptmp->rcExclude.top; + } + else + pt.x = pt.y = 0; + } + else + pt = *ppt; + + tmp.cbSize = sizeof(tmp); + + fuFlags = TPM_RETURNCMD | TPM_VERTICAL; + fuFlags |= (TrackUp ? TPM_BOTTOMALIGN : TPM_TOPALIGN); + if (IsContextMenu) + fuFlags |= TPM_RIGHTBUTTON; + else + fuFlags |= (TrackUp ? TPM_VERNEGANIMATION : TPM_VERPOSANIMATION); + + cmdId = TrackPopupMenuEx(hMenu, + fuFlags, + pt.x, + pt.y, + m_hWnd, + ptmp); + + return cmdId; + } + + HRESULT TrackCtxMenu( + IN IContextMenu * contextMenu, + IN POINT *ppt OPTIONAL, + IN HWND hwndExclude OPTIONAL, + IN BOOL TrackUp, + IN PVOID Context OPTIONAL) + { + INT x = ppt->x; + INT y = ppt->y; + HRESULT hr; + UINT uCommand; + HMENU popup = CreatePopupMenu(); + + if (popup == NULL) + return E_FAIL; + + TRACE("Before Query\n"); + hr = contextMenu->QueryContextMenu(popup, 0, 0, UINT_MAX, CMF_NORMAL); + if (FAILED_UNEXPECTEDLY(hr)) + { + TRACE("Query failed\n"); + DestroyMenu(popup); + return hr; + } + + TRACE("Before Tracking\n"); + uCommand = ::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, m_hWnd, NULL); + + if (uCommand != 0) + { + TRACE("Before InvokeCommand\n"); + CMINVOKECOMMANDINFO cmi = { 0 }; + cmi.cbSize = sizeof(cmi); + cmi.lpVerb = MAKEINTRESOURCEA(uCommand); + cmi.hwnd = m_hWnd; + hr = contextMenu->InvokeCommand(&cmi); + } + else + { + TRACE("TrackPopupMenu failed. Code=%d, LastError=%d\n", uCommand, GetLastError()); + hr = S_FALSE; + } + + DestroyMenu(popup); + return hr; + } + + + + + + /********************************************************** + * ##### moving and sizing handling ##### + */ + + BOOL UpdateNonClientMetrics() + { + NONCLIENTMETRICS ncm; + ncm.cbSize = sizeof(ncm); + if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) + { + if (m_Font != NULL) + DeleteObject(m_Font); + + m_Font = CreateFontIndirect(&ncm.lfMessageFont); + return TRUE; + } + + return FALSE; + } + + VOID SetWindowsFont() + { + if (m_TrayNotify != NULL) + { + SendMessage(m_TrayNotify, WM_SETFONT, (WPARAM) m_Font, TRUE); + } + } + + HMONITOR GetScreenRectFromRect( + IN OUT RECT *pRect, + IN DWORD dwFlags) + { + MONITORINFO mi; + HMONITOR hMon; + + mi.cbSize = sizeof(mi); + hMon = MonitorFromRect(pRect, dwFlags); + if (hMon != NULL && + GetMonitorInfo(hMon, &mi)) + { + *pRect = mi.rcMonitor; + } + else + { + pRect->left = 0; + pRect->top = 0; + pRect->right = GetSystemMetrics(SM_CXSCREEN); + pRect->bottom = GetSystemMetrics(SM_CYSCREEN); + + hMon = NULL; + } + + return hMon; + } + + HMONITOR GetMonitorFromRect( + IN const RECT *pRect) + { + HMONITOR hMon; + + /* In case the monitor sizes or saved sizes differ a bit (probably + not a lot, only so the tray window overlaps into another monitor + now), minimize the risk that we determine a wrong monitor by + using the center point of the tray window if we can't determine + it using the rectangle. */ + hMon = MonitorFromRect(pRect, MONITOR_DEFAULTTONULL); + if (hMon == NULL) + { + POINT pt; + + pt.x = pRect->left + ((pRect->right - pRect->left) / 2); + pt.y = pRect->top + ((pRect->bottom - pRect->top) / 2); + + /* be less error-prone, find the nearest monitor */ + hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST); + } + + return hMon; + } + + HMONITOR GetScreenRect( + IN HMONITOR hMonitor, + IN OUT RECT *pRect) + { + HMONITOR hMon = NULL; + + if (hMonitor != NULL) + { + MONITORINFO mi; + + mi.cbSize = sizeof(mi); + if (!GetMonitorInfo(hMonitor, &mi)) + { + /* Hm, the monitor is gone? Try to find a monitor where it + could be located now */ + hMon = GetMonitorFromRect(pRect); + if (hMon == NULL || + !GetMonitorInfo(hMon, &mi)) { - /* Reset?? */ - Locked = bPrevLock; - return bPrevLock; + hMon = NULL; + goto GetPrimaryRect; } } - if (Locked && m_Theme) - { - SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); + *pRect = mi.rcMonitor; + } + else + { +GetPrimaryRect: + pRect->left = 0; + pRect->top = 0; + pRect->right = GetSystemMetrics(SM_CXSCREEN); + pRect->bottom = GetSystemMetrics(SM_CYSCREEN); + } + + return hMon; + } + + VOID MakeTrayRectWithSize(IN DWORD Position, + IN const SIZE *pTraySize, + IN OUT RECT *pRect) + { + switch (Position) + { + case ABE_LEFT: + pRect->right = pRect->left + pTraySize->cx; + break; + + case ABE_TOP: + pRect->bottom = pRect->top + pTraySize->cy; + break; + + case ABE_RIGHT: + pRect->left = pRect->right - pTraySize->cx; + break; + + case ABE_BOTTOM: + default: + pRect->top = pRect->bottom - pTraySize->cy; + break; + } + } + + VOID GetTrayRectFromScreenRect(IN DWORD Position, + IN const RECT *pScreen, + IN const SIZE *pTraySize OPTIONAL, + OUT RECT *pRect) + { + if (pTraySize == NULL) + pTraySize = &m_TraySize; + + *pRect = *pScreen; + + /* Move the border outside of the screen */ + InflateRect(pRect, + GetSystemMetrics(SM_CXEDGE), + GetSystemMetrics(SM_CYEDGE)); + + MakeTrayRectWithSize(Position, pTraySize, pRect); + } + + BOOL IsPosHorizontal() + { + return m_Position == ABE_TOP || m_Position == ABE_BOTTOM; + } + + HMONITOR CalculateValidSize( + IN DWORD Position, + IN OUT RECT *pRect) + { + RECT rcScreen; + //BOOL Horizontal; + HMONITOR hMon; + SIZE szMax, szWnd; + + //Horizontal = IsPosHorizontal(); + + szWnd.cx = pRect->right - pRect->left; + szWnd.cy = pRect->bottom - pRect->top; + + rcScreen = *pRect; + hMon = GetScreenRectFromRect( + &rcScreen, + MONITOR_DEFAULTTONEAREST); + + /* Calculate the maximum size of the tray window and limit the window + size to half of the screen's size. */ + szMax.cx = (rcScreen.right - rcScreen.left) / 2; + szMax.cy = (rcScreen.bottom - rcScreen.top) / 2; + if (szWnd.cx > szMax.cx) + szWnd.cx = szMax.cx; + if (szWnd.cy > szMax.cy) + szWnd.cy = szMax.cy; + + /* FIXME - calculate */ + + GetTrayRectFromScreenRect(Position, + &rcScreen, + &szWnd, + pRect); + + return hMon; + } + +#if 0 + VOID + GetMinimumWindowSize( + OUT RECT *pRect) + { + RECT rcMin = {0}; + + AdjustWindowRectEx(&rcMin, + GetWindowLong(m_hWnd, + GWL_STYLE), + FALSE, + GetWindowLong(m_hWnd, + GWL_EXSTYLE)); + + *pRect = rcMin; + } +#endif + + + DWORD GetDraggingRectFromPt( + IN POINT pt, + OUT RECT *pRect, + OUT HMONITOR *phMonitor) + { + HMONITOR hMon, hMonNew; + DWORD PosH, PosV, Pos; + SIZE DeltaPt, ScreenOffset; + RECT rcScreen; + + rcScreen.left = 0; + rcScreen.top = 0; + + /* Determine the screen rectangle */ + hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL); + if (hMon != NULL) + { + MONITORINFO mi; + + mi.cbSize = sizeof(mi); + if (!GetMonitorInfo(hMon, &mi)) + { + hMon = NULL; + goto GetPrimaryScreenRect; + } + + /* make left top corner of the screen zero based to + make calculations easier */ + pt.x -= mi.rcMonitor.left; + pt.y -= mi.rcMonitor.top; + + ScreenOffset.cx = mi.rcMonitor.left; + ScreenOffset.cy = mi.rcMonitor.top; + rcScreen.right = mi.rcMonitor.right - mi.rcMonitor.left; + rcScreen.bottom = mi.rcMonitor.bottom - mi.rcMonitor.top; + } + else + { +GetPrimaryScreenRect: + ScreenOffset.cx = 0; + ScreenOffset.cy = 0; + rcScreen.right = GetSystemMetrics(SM_CXSCREEN); + rcScreen.bottom = GetSystemMetrics(SM_CYSCREEN); + } + + /* Calculate the nearest screen border */ + if (pt.x < rcScreen.right / 2) + { + DeltaPt.cx = pt.x; + PosH = ABE_LEFT; + } + else + { + DeltaPt.cx = rcScreen.right - pt.x; + PosH = ABE_RIGHT; + } + + if (pt.y < rcScreen.bottom / 2) + { + DeltaPt.cy = pt.y; + PosV = ABE_TOP; + } + else + { + DeltaPt.cy = rcScreen.bottom - pt.y; + PosV = ABE_BOTTOM; + } + + Pos = (DeltaPt.cx * rcScreen.bottom < DeltaPt.cy * rcScreen.right) ? PosH : PosV; + + /* Fix the screen origin to be relative to the primary monitor again */ + OffsetRect(&rcScreen, + ScreenOffset.cx, + ScreenOffset.cy); + + RECT rcPos = m_TrayRects[Pos]; + + hMonNew = GetMonitorFromRect(&rcPos); + if (hMon != hMonNew) + { + SIZE szTray; + + /* Recalculate the rectangle, we're dragging to another monitor. + We don't need to recalculate the rect on single monitor systems. */ + szTray.cx = rcPos.right - rcPos.left; + szTray.cy = rcPos.bottom - rcPos.top; + + GetTrayRectFromScreenRect(Pos, &rcScreen, &szTray, pRect); + if (AutoHide) + { + pRect->left += m_AutoHideOffset.cx; + pRect->right += m_AutoHideOffset.cx; + pRect->top += m_AutoHideOffset.cy; + pRect->bottom += m_AutoHideOffset.cy; + } + hMon = hMonNew; + } + else + { + /* The user is dragging the tray window on the same monitor. We don't need + to recalculate the rectangle */ + *pRect = rcPos; + if (AutoHide) + { + pRect->left += m_AutoHideOffset.cx; + pRect->right += m_AutoHideOffset.cx; + pRect->top += m_AutoHideOffset.cy; + pRect->bottom += m_AutoHideOffset.cy; + } + } + + *phMonitor = hMon; + + return Pos; + } + + DWORD GetDraggingRectFromRect( + IN OUT RECT *pRect, + OUT HMONITOR *phMonitor) + { + POINT pt; + + /* Calculate the center of the rectangle. We call + GetDraggingRectFromPt to calculate a valid + dragging rectangle */ + pt.x = pRect->left + ((pRect->right - pRect->left) / 2); + pt.y = pRect->top + ((pRect->bottom - pRect->top) / 2); + + return GetDraggingRectFromPt( + pt, + pRect, + phMonitor); + } + + VOID ChangingWinPos(IN OUT LPWINDOWPOS pwp) + { + RECT rcTray; + + if (IsDragging) + { + rcTray.left = pwp->x; + rcTray.top = pwp->y; + rcTray.right = rcTray.left + pwp->cx; + rcTray.bottom = rcTray.top + pwp->cy; + if (AutoHide) + { + rcTray.left -= m_AutoHideOffset.cx; + rcTray.right -= m_AutoHideOffset.cx; + rcTray.top -= m_AutoHideOffset.cy; + rcTray.bottom -= m_AutoHideOffset.cy; + } + + if (!EqualRect(&rcTray, + &m_TrayRects[m_DraggingPosition])) + { + /* Recalculate the rectangle, the user dragged the tray + window to another monitor or the window was somehow else + moved or resized */ + m_DraggingPosition = GetDraggingRectFromRect( + &rcTray, + &m_DraggingMonitor); + //m_TrayRects[DraggingPosition] = rcTray; + } + + //Monitor = CalculateValidSize(DraggingPosition, + // &rcTray); + + m_Monitor = m_DraggingMonitor; + m_Position = m_DraggingPosition; + IsDragging = FALSE; + + m_TrayRects[m_Position] = rcTray; + goto ChangePos; + } + else if (GetWindowRect(&rcTray)) + { + if (InSizeMove) + { + if (!(pwp->flags & SWP_NOMOVE)) + { + rcTray.left = pwp->x; + rcTray.top = pwp->y; + } + + if (!(pwp->flags & SWP_NOSIZE)) + { + rcTray.right = rcTray.left + pwp->cx; + rcTray.bottom = rcTray.top + pwp->cy; + } + + m_Position = GetDraggingRectFromRect(&rcTray, &m_Monitor); + + if (!(pwp->flags & (SWP_NOMOVE | SWP_NOSIZE))) + { + SIZE szWnd; + + szWnd.cx = pwp->cx; + szWnd.cy = pwp->cy; + + MakeTrayRectWithSize(m_Position, &szWnd, &rcTray); + } + + if (AutoHide) + { + rcTray.left -= m_AutoHideOffset.cx; + rcTray.right -= m_AutoHideOffset.cx; + rcTray.top -= m_AutoHideOffset.cy; + rcTray.bottom -= m_AutoHideOffset.cy; + } + m_TrayRects[m_Position] = rcTray; } else { - SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); - } - SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); - - } - - return bPrevLock; - } - - - LRESULT DrawBackground(HDC hdc) - { - RECT rect; - int partId; - HRESULT res; - - GetClientRect(&rect); - - if (m_Theme) - { - GetClientRect(&rect); + /* If the user isn't resizing the tray window we need to make sure the + new size or position is valid. this is to prevent changes to the window + without user interaction. */ + rcTray = m_TrayRects[m_Position]; + } + +ChangePos: + m_TraySize.cx = rcTray.right - rcTray.left; + m_TraySize.cy = rcTray.bottom - rcTray.top; + + if (AutoHide) + { + rcTray.left += m_AutoHideOffset.cx; + rcTray.right += m_AutoHideOffset.cx; + rcTray.top += m_AutoHideOffset.cy; + rcTray.bottom += m_AutoHideOffset.cy; + } + + pwp->flags &= ~(SWP_NOMOVE | SWP_NOSIZE); + pwp->x = rcTray.left; + pwp->y = rcTray.top; + pwp->cx = m_TraySize.cx; + pwp->cy = m_TraySize.cy; + } + } + + VOID ApplyClipping(IN BOOL Clip) + { + RECT rcClip, rcWindow; + HRGN hClipRgn; + + if (GetWindowRect(&rcWindow)) + { + /* Disable clipping on systems with only one monitor */ + if (GetSystemMetrics(SM_CMONITORS) <= 1) + Clip = FALSE; + + if (Clip) + { + rcClip = rcWindow; + + GetScreenRect(m_Monitor, &rcClip); + + if (!IntersectRect(&rcClip, &rcClip, &rcWindow)) + { + rcClip = rcWindow; + } + + OffsetRect(&rcClip, + -rcWindow.left, + -rcWindow.top); + + hClipRgn = CreateRectRgnIndirect(&rcClip); + } + else + hClipRgn = NULL; + + /* Set the clipping region or make sure the window isn't clipped + by disabling it explicitly. */ + SetWindowRgn(hClipRgn, TRUE); + } + } + + VOID ResizeWorkArea() + { +#if !WIN7_DEBUG_MODE + RECT rcTray, rcWorkArea; + + /* If monitor has changed then fix the previous monitors work area */ + if (m_PreviousMonitor != m_Monitor) + { + GetScreenRect(m_PreviousMonitor, &rcWorkArea); + SystemParametersInfoW(SPI_SETWORKAREA, + 1, + &rcWorkArea, + SPIF_SENDCHANGE); + } + + rcTray = m_TrayRects[m_Position]; + + GetScreenRect(m_Monitor, &rcWorkArea); + m_PreviousMonitor = m_Monitor; + + /* If AutoHide is false then change the workarea to exclude + the area that the taskbar covers. */ + if (!AutoHide) + { switch (m_Position) { + case ABE_TOP: + rcWorkArea.top = rcTray.bottom; + break; case ABE_LEFT: - partId = TBP_BACKGROUNDLEFT; - break; - case ABE_TOP: - partId = TBP_BACKGROUNDTOP; + rcWorkArea.left = rcTray.right; break; case ABE_RIGHT: - partId = TBP_BACKGROUNDRIGHT; + rcWorkArea.right = rcTray.left; break; case ABE_BOTTOM: - default: - partId = TBP_BACKGROUNDBOTTOM; + rcWorkArea.bottom = rcTray.top; break; } - res = DrawThemeBackground(m_Theme, hdc, partId, 0, &rect, 0); - } - - return res; - } - - LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - HDC hdc = (HDC) wParam; - - if (!m_Theme) - { - bHandled = FALSE; - return 0; - } - - return DrawBackground(hdc); - } - - int DrawSizer(IN HRGN hRgn) - { - HDC hdc; - RECT rect; - int backoundPart; - - GetWindowRect(&rect); - OffsetRect(&rect, -rect.left, -rect.top); - - hdc = GetDCEx(hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_PARENTCLIP); - - switch (m_Position) - { - case ABE_LEFT: - backoundPart = TBP_SIZINGBARLEFT; - rect.left = rect.right - GetSystemMetrics(SM_CXSIZEFRAME); - break; - case ABE_TOP: - backoundPart = TBP_SIZINGBARTOP; - rect.top = rect.bottom - GetSystemMetrics(SM_CYSIZEFRAME); - break; - case ABE_RIGHT: - backoundPart = TBP_SIZINGBARRIGHT; - rect.right = rect.left + GetSystemMetrics(SM_CXSIZEFRAME); - break; - case ABE_BOTTOM: - default: - backoundPart = TBP_SIZINGBARBOTTOM; - rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZEFRAME); - break; - } - if (IsThemeBackgroundPartiallyTransparent(m_Theme, backoundPart, 0)) - { - DrawThemeParentBackground(m_hWnd, hdc, &rect); - } - DrawThemeBackground(m_Theme, hdc, backoundPart, 0, &rect, 0); - - ReleaseDC(hdc); - return 0; - } - - DWORD WINAPI RunFileDlgThread() - { - HWND hwnd; - RECT posRect; - - m_StartButton.GetWindowRect(&posRect); - - hwnd = CreateWindowEx(0, - WC_STATIC, - NULL, - WS_OVERLAPPED | WS_DISABLED | WS_CLIPSIBLINGS | WS_BORDER | SS_LEFT, - posRect.left, - posRect.top, - posRect.right - posRect.left, - posRect.bottom - posRect.top, - NULL, - NULL, - NULL, - NULL); - - m_RunFileDlgOwner = hwnd; - - RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY); - - m_RunFileDlgOwner = NULL; - ::DestroyWindow(hwnd); - - return 0; - } - - static DWORD WINAPI s_RunFileDlgThread(IN OUT PVOID pParam) - { - CTrayWindow * This = (CTrayWindow*) pParam; - return This->RunFileDlgThread(); - } - - void DisplayRunFileDlg() - { - HWND hRunDlg; - if (m_RunFileDlgOwner) - { - hRunDlg = ::GetLastActivePopup(m_RunFileDlgOwner); - if (hRunDlg != NULL && - hRunDlg != m_RunFileDlgOwner) - { - SetForegroundWindow(hRunDlg); + } + + /* + * Resize the current monitor work area. Win32k will also send + * a WM_SIZE message to automatically resize the desktop. + */ + SystemParametersInfoW(SPI_SETWORKAREA, + 1, + &rcWorkArea, + SPIF_SENDCHANGE); +#endif + } + + VOID CheckTrayWndPosition() + { + RECT rcTray; + + rcTray = m_TrayRects[m_Position]; + + if (AutoHide) + { + rcTray.left += m_AutoHideOffset.cx; + rcTray.right += m_AutoHideOffset.cx; + rcTray.top += m_AutoHideOffset.cy; + rcTray.bottom += m_AutoHideOffset.cy; + } + + /* Move the tray window */ + SetWindowPos(NULL, + rcTray.left, + rcTray.top, + rcTray.right - rcTray.left, + rcTray.bottom - rcTray.top, + SWP_NOZORDER | SWP_NOACTIVATE); + + ResizeWorkArea(); + + ApplyClipping(TRUE); + } + + typedef struct _TW_STUCKRECTS2 + { + DWORD cbSize; + LONG Unknown; + DWORD dwFlags; + DWORD Position; + SIZE Size; + RECT Rect; + } TW_STRUCKRECTS2, *PTW_STUCKRECTS2; + + VOID RegLoadSettings() + { + DWORD Pos; + TW_STRUCKRECTS2 sr; + RECT rcScreen; + SIZE WndSize, EdgeSize, DlgFrameSize; + DWORD cbSize = sizeof(sr); + SIZE StartBtnSize = m_StartButton.GetSize(); + + EdgeSize.cx = GetSystemMetrics(SM_CXEDGE); + EdgeSize.cy = GetSystemMetrics(SM_CYEDGE); + DlgFrameSize.cx = GetSystemMetrics(SM_CXDLGFRAME); + DlgFrameSize.cy = GetSystemMetrics(SM_CYDLGFRAME); + + if (SHGetValue(hkExplorer, + TEXT("StuckRects2"), + TEXT("Settings"), + NULL, + &sr, + &cbSize) == ERROR_SUCCESS && + sr.cbSize == sizeof(sr)) + { + AutoHide = (sr.dwFlags & ABS_AUTOHIDE) != 0; + AlwaysOnTop = (sr.dwFlags & ABS_ALWAYSONTOP) != 0; + SmSmallIcons = (sr.dwFlags & 0x4) != 0; + HideClock = (sr.dwFlags & 0x8) != 0; + + /* FIXME: Are there more flags? */ + +#if WIN7_DEBUG_MODE + m_Position = ABE_LEFT; +#else + if (sr.Position > ABE_BOTTOM) + m_Position = ABE_BOTTOM; + else + m_Position = sr.Position; +#endif + + /* Try to find out which monitor the tray window was located on last. + Here we're only interested in the monitor screen that we think + is the last one used. We're going to determine on which monitor + we really are after calculating the docked position. */ + rcScreen = sr.Rect; + GetScreenRectFromRect( + &rcScreen, + MONITOR_DEFAULTTONEAREST); + } + else + { + m_Position = ABE_BOTTOM; + AlwaysOnTop = TRUE; + + /* Use the minimum size of the taskbar, we'll use the start + button as a minimum for now. Make sure we calculate the + entire window size, not just the client size. However, we + use a thinner border than a standard thick border, so that + the start button and bands are not stuck to the screen border. */ + sr.Size.cx = StartBtnSize.cx + (2 * (EdgeSize.cx + DlgFrameSize.cx)); + sr.Size.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); + + /* Use the primary screen by default */ + rcScreen.left = 0; + rcScreen.top = 0; + rcScreen.right = GetSystemMetrics(SM_CXSCREEN); + rcScreen.bottom = GetSystemMetrics(SM_CYSCREEN); + GetScreenRectFromRect( + &rcScreen, + MONITOR_DEFAULTTOPRIMARY); + } + + if (m_hWnd != NULL) + SetWindowPos( + AlwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, + 0, + 0, + 0, + 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + /* Determine a minimum tray window rectangle. The "client" height is + zero here since we cannot determine an optimal minimum width when + loaded as a vertical tray window. We just need to make sure the values + loaded from the registry are at least. The windows explorer behaves + the same way, it allows the user to save a zero width vertical tray + window, but not a zero height horizontal tray window. */ + WndSize.cx = 2 * (EdgeSize.cx + DlgFrameSize.cx); + WndSize.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); + + if (WndSize.cx < sr.Size.cx) + WndSize.cx = sr.Size.cx; + if (WndSize.cy < sr.Size.cy) + WndSize.cy = sr.Size.cy; + + /* Save the calculated size */ + m_TraySize = WndSize; + + /* Calculate all docking rectangles. We need to do this here so they're + initialized and dragging the tray window to another position gives + usable results */ + for (Pos = ABE_LEFT; Pos <= ABE_BOTTOM; Pos++) + { + GetTrayRectFromScreenRect(Pos, + &rcScreen, + &m_TraySize, + &m_TrayRects[Pos]); + // TRACE("m_TrayRects[%d(%d)]: %d,%d,%d,%d\n", Pos, Position, m_TrayRects[Pos].left, m_TrayRects[Pos].top, m_TrayRects[Pos].right, m_TrayRects[Pos].bottom); + } + + /* Determine which monitor we are on. It shouldn't matter which docked + position rectangle we use */ + m_Monitor = GetMonitorFromRect(&m_TrayRects[ABE_LEFT]); + } + + VOID AlignControls(IN PRECT prcClient OPTIONAL) + { + RECT rcClient; + SIZE TraySize, StartSize; + POINT ptTrayNotify = { 0, 0 }; + BOOL Horizontal; + HDWP dwp; + + m_StartButton.UpdateSize(); + if (prcClient != NULL) + { + rcClient = *prcClient; + } + else + { + if (!GetClientRect(&rcClient)) + { + ERR("Could not get client rect lastErr=%d\n", GetLastError()); return; } } - CloseHandle(CreateThread(NULL, 0, s_RunFileDlgThread, this, 0, NULL)); + Horizontal = IsPosHorizontal(); + + /* We're about to resize/move the start button, the rebar control and + the tray notification control */ + dwp = BeginDeferWindowPos(3); + if (dwp == NULL) + { + ERR("BeginDeferWindowPos failed. lastErr=%d\n", GetLastError()); + return; + } + + /* Limit the Start button width to the client width, if neccessary */ + StartSize = m_StartButton.GetSize(); + if (StartSize.cx > rcClient.right) + StartSize.cx = rcClient.right; + + if (m_StartButton.m_hWnd != NULL) + { + /* Resize and reposition the button */ + dwp = m_StartButton.DeferWindowPos(dwp, + NULL, + 0, + 0, + StartSize.cx, + StartSize.cy, + SWP_NOZORDER | SWP_NOACTIVATE); + if (dwp == NULL) + { + ERR("DeferWindowPos for start button failed. lastErr=%d\n", GetLastError()); + return; + } + } + + /* Determine the size that the tray notification window needs */ + if (Horizontal) + { + TraySize.cx = 0; + TraySize.cy = rcClient.bottom; + } + else + { + TraySize.cx = rcClient.right; + TraySize.cy = 0; + } + + if (m_TrayNotify != NULL && + SendMessage(m_TrayNotify, + TNWM_GETMINIMUMSIZE, + (WPARAM)Horizontal, + (LPARAM)&TraySize)) + { + /* Move the tray notification window to the desired location */ + if (Horizontal) + ptTrayNotify.x = rcClient.right - TraySize.cx; + else + ptTrayNotify.y = rcClient.bottom - TraySize.cy; + + dwp = ::DeferWindowPos(dwp, + m_TrayNotify, + NULL, + ptTrayNotify.x, + ptTrayNotify.y, + TraySize.cx, + TraySize.cy, + SWP_NOZORDER | SWP_NOACTIVATE); + if (dwp == NULL) + { + ERR("DeferWindowPos for notification area failed. lastErr=%d\n", GetLastError()); + return; + } + } + + /* Resize/Move the rebar control */ + if (m_Rebar != NULL) + { + POINT ptRebar = { 0, 0 }; + SIZE szRebar; + + SetWindowStyle(m_Rebar, CCS_VERT, Horizontal ? 0 : CCS_VERT); + + if (Horizontal) + { + ptRebar.x = StartSize.cx + GetSystemMetrics(SM_CXSIZEFRAME); + szRebar.cx = ptTrayNotify.x - ptRebar.x; + szRebar.cy = rcClient.bottom; + } + else + { + ptRebar.y = StartSize.cy + GetSystemMetrics(SM_CYSIZEFRAME); + szRebar.cx = rcClient.right; + szRebar.cy = ptTrayNotify.y - ptRebar.y; + } + + dwp = ::DeferWindowPos(dwp, + m_Rebar, + NULL, + ptRebar.x, + ptRebar.y, + szRebar.cx, + szRebar.cy, + SWP_NOZORDER | SWP_NOACTIVATE); + } + + if (dwp != NULL) + EndDeferWindowPos(dwp); + + if (m_TaskSwitch != NULL) + { + /* Update the task switch window configuration */ + SendMessage(m_TaskSwitch, TSWM_UPDATETASKBARPOS, 0, 0); + } } void PopupStartMenu() @@ -2169,17 +1991,333 @@ SetWindowPos(NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOZORDER); } - LRESULT OnDisplayChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { + + + + + /********************************************************** + * ##### taskbar drawing ##### + */ + + LRESULT EraseBackgroundWithTheme(HDC hdc) + { + RECT rect; + int partId; + HRESULT res; + + GetClientRect(&rect); + + if (m_Theme) + { + GetClientRect(&rect); + switch (m_Position) + { + case ABE_LEFT: + partId = TBP_BACKGROUNDLEFT; + break; + case ABE_TOP: + partId = TBP_BACKGROUNDTOP; + break; + case ABE_RIGHT: + partId = TBP_BACKGROUNDRIGHT; + break; + case ABE_BOTTOM: + default: + partId = TBP_BACKGROUNDBOTTOM; + break; + } + res = DrawThemeBackground(m_Theme, hdc, partId, 0, &rect, 0); + } + + return res; + } + + int DrawSizerWithTheme(IN HRGN hRgn) + { + HDC hdc; + RECT rect; + int backoundPart; + + GetWindowRect(&rect); + OffsetRect(&rect, -rect.left, -rect.top); + + hdc = GetDCEx(hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_PARENTCLIP); + + switch (m_Position) + { + case ABE_LEFT: + backoundPart = TBP_SIZINGBARLEFT; + rect.left = rect.right - GetSystemMetrics(SM_CXSIZEFRAME); + break; + case ABE_TOP: + backoundPart = TBP_SIZINGBARTOP; + rect.top = rect.bottom - GetSystemMetrics(SM_CYSIZEFRAME); + break; + case ABE_RIGHT: + backoundPart = TBP_SIZINGBARRIGHT; + rect.right = rect.left + GetSystemMetrics(SM_CXSIZEFRAME); + break; + case ABE_BOTTOM: + default: + backoundPart = TBP_SIZINGBARBOTTOM; + rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZEFRAME); + break; + } + if (IsThemeBackgroundPartiallyTransparent(m_Theme, backoundPart, 0)) + { + DrawThemeParentBackground(m_hWnd, hdc, &rect); + } + DrawThemeBackground(m_Theme, hdc, backoundPart, 0, &rect, 0); + + ReleaseDC(hdc); + return 0; + } + + + + + + /* + * ITrayWindow + */ + HRESULT STDMETHODCALLTYPE Open() + { + RECT rcWnd; + + /* Check if there's already a window created and try to show it. + If it was somehow destroyed just create a new tray window. */ + if (m_hWnd != NULL && IsWindow()) + { + if (!IsWindowVisible()) + { + CheckTrayWndPosition(); + + ShowWindow(SW_SHOW); + } + + return S_OK; + } + + DWORD dwExStyle = WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE; + if (AlwaysOnTop) + dwExStyle |= WS_EX_TOPMOST; + + DWORD dwStyle = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | + WS_BORDER | WS_THICKFRAME; + + ZeroMemory(&rcWnd, sizeof(rcWnd)); + if (m_Position != (DWORD) -1) + rcWnd = m_TrayRects[m_Position]; + + if (!Create(NULL, rcWnd, NULL, dwStyle, dwExStyle)) + return E_FAIL; + + return S_OK; + } + + HRESULT STDMETHODCALLTYPE Close() + { + if (m_hWnd != NULL) + { + SendMessage(m_hWnd, + WM_APP_TRAYDESTROY, + 0, + 0); + } + + return S_OK; + } + + HWND STDMETHODCALLTYPE GetHWND() + { + return m_hWnd; + } + + BOOL STDMETHODCALLTYPE IsSpecialHWND(IN HWND hWnd) + { + return (m_hWnd == hWnd || + (m_DesktopWnd != NULL && m_hWnd == m_DesktopWnd)); + } + + BOOL STDMETHODCALLTYPE IsHorizontal() + { + return IsPosHorizontal(); + } + + HFONT STDMETHODCALLTYPE GetCaptionFonts(OUT HFONT *phBoldCaption OPTIONAL) + { + if (phBoldCaption != NULL) + *phBoldCaption = m_StartButton.GetFont(); + + return m_CaptionFont; + } + + BOOL STDMETHODCALLTYPE Lock(IN BOOL bLock) + { + BOOL bPrevLock = Locked; + + if (Locked != bLock) + { + Locked = bLock; + + if (m_TrayBandSite != NULL) + { + if (!SUCCEEDED(m_TrayBandSite->Lock(bLock))) + { + /* Reset?? */ + Locked = bPrevLock; + return bPrevLock; + } + } + + if (Locked && m_Theme) + { + SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); + } + else + { + SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); + } + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); + + } + + return bPrevLock; + } + + + + + + + /********************************************************** + * ##### message handling ##### + */ + + LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + ((ITrayWindow*)this)->AddRef(); + + SetWindowTheme(m_hWnd, L"TaskBar", NULL); + + InterlockedIncrement(&TrayWndCount); + + if (m_CaptionFont == NULL) + { + NONCLIENTMETRICS ncm; + + /* Get the system fonts, we use the caption font, + always bold, though. */ + ncm.cbSize = sizeof(ncm); + if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE)) + { + if (m_CaptionFont == NULL) + { + ncm.lfCaptionFont.lfWeight = FW_NORMAL; + m_CaptionFont = CreateFontIndirect(&ncm.lfCaptionFont); + } + } + } + + /* Create the Start button */ + m_StartButton.Create(m_hWnd); + /* Load the saved tray window settings */ RegLoadSettings(); + /* Create and initialize the start menu */ + HBITMAP hbmBanner = LoadBitmapW(hExplorerInstance, MAKEINTRESOURCEW(IDB_STARTMENU)); + m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner, 0); + + /* Load the tray band site */ + m_TrayBandSite = CreateTrayBandSite(this, &m_Rebar, &m_TaskSwitch); + SetWindowTheme(m_Rebar, L"TaskBar", NULL); + + /* Create the tray notification window */ + m_TrayNotify = CreateTrayNotifyWnd(this, HideClock, &m_TrayNotifyInstance); + + if (UpdateNonClientMetrics()) + { + SetWindowsFont(); + } + /* Move the tray window to the right position and resize it if neccessary */ CheckTrayWndPosition(); /* Align all controls on the tray window */ AlignControls(NULL); + InitShellServices(&m_ShellServices); + + if (AutoHide) + { + m_AutoHideState = AUTOHIDE_HIDING; + SetTimer(TIMER_ID_AUTOHIDE, AUTOHIDE_DELAY_HIDE, NULL); + } + + RegisterHotKey(m_hWnd, IDHK_RUN, MOD_WIN, 'R'); + RegisterHotKey(m_hWnd, IDHK_MINIMIZE_ALL, MOD_WIN, 'M'); + RegisterHotKey(m_hWnd, IDHK_RESTORE_ALL, MOD_WIN|MOD_SHIFT, 'M'); + RegisterHotKey(m_hWnd, IDHK_HELP, MOD_WIN, VK_F1); + RegisterHotKey(m_hWnd, IDHK_EXPLORE, MOD_WIN, 'E'); + RegisterHotKey(m_hWnd, IDHK_FIND, MOD_WIN, 'F'); + RegisterHotKey(m_hWnd, IDHK_FIND_COMPUTER, MOD_WIN|MOD_CONTROL, 'F'); + RegisterHotKey(m_hWnd, IDHK_NEXT_TASK, MOD_WIN, VK_TAB); + RegisterHotKey(m_hWnd, IDHK_PREV_TASK, MOD_WIN|MOD_SHIFT, VK_TAB); + RegisterHotKey(m_hWnd, IDHK_SYS_PROPERTIES, MOD_WIN, VK_PAUSE); + RegisterHotKey(m_hWnd, IDHK_DESKTOP, MOD_WIN, 'D'); + RegisterHotKey(m_hWnd, IDHK_PAGER, MOD_WIN, 'B'); + + return TRUE; + } + + LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (m_Theme) + CloseThemeData(m_Theme); + + if (IsThemeActive()) + m_Theme = OpenThemeData(m_hWnd, L"TaskBar"); + else + m_Theme = NULL; + + if (Locked && m_Theme) + { + SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); + } + else + { + SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); + } + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); + + return TRUE; + } + + LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + HDC hdc = (HDC) wParam; + + if (!m_Theme) + { + bHandled = FALSE; + return 0; + } + + return EraseBackgroundWithTheme(hdc); + } + + LRESULT OnDisplayChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + /* Load the saved tray window settings */ + RegLoadSettings(); + + /* Move the tray window to the right position and resize it if neccessary */ + CheckTrayWndPosition(); + + /* Align all controls on the tray window */ + AlignControls(NULL); + return TRUE; } @@ -2201,7 +2339,7 @@ return 0; } - return DrawSizer((HRGN) wParam); + return DrawSizerWithTheme((HRGN) wParam); } LRESULT OnCtlColorBtn(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -2627,12 +2765,6 @@ return TRUE; } - LRESULT DoExitWindows() - { - ExitWindowsDialog(m_hWnd); - return 0; - } - LRESULT OnDoExitWindows(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* @@ -2654,70 +2786,9 @@ return TRUE; } - HRESULT ExecResourceCmd(int id) - { - WCHAR szCommand[256]; - WCHAR *pszParameters; - - if (!LoadStringW(hExplorerInstance, - id, - szCommand, - _countof(szCommand))) - { - return E_FAIL; - } - - pszParameters = wcschr(szCommand, L'>'); - if (pszParameters) - { - *pszParameters = 0; - pszParameters++; - } - - ShellExecuteW(m_hWnd, NULL, szCommand, pszParameters, NULL, SW_SHOWNORMAL); - return S_OK; - } - LRESULT OnHotkey(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - switch (wParam) - { - case IDHK_RUN: - DisplayRunFileDlg(); - break; - case IDHK_HELP: - ExecResourceCmd(IDS_HELP_COMMAND); - break; - case IDHK_EXPLORE: - //FIXME: We don't support this yet: - //ShellExecuteW(0, L"explore", NULL, NULL, NULL, 1); - ShellExecuteW(0, NULL, L"explorer.exe", NULL, NULL, 1); - break; - case IDHK_FIND: - SHFindFiles(NULL, NULL); - break; - case IDHK_FIND_COMPUTER: - SHFindComputer(NULL, NULL); - break; - case IDHK_SYS_PROPERTIES: - //FIXME: Use SHRunControlPanel - ShellExecuteW(m_hWnd, NULL, L"sysdm.cpl", NULL, NULL, SW_NORMAL); - break; - case IDHK_NEXT_TASK: - break; - case IDHK_PREV_TASK: - break; - case IDHK_MINIMIZE_ALL: - break; - case IDHK_RESTORE_ALL: - break; - case IDHK_DESKTOP: - break; - case IDHK_PAGER: - break; - } - - return 0; + return HandleHotKey(wParam); } LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -2732,38 +2803,7 @@ if (m_TrayBandSite == NULL || FAILED_UNEXPECTEDLY(m_TrayBandSite->ProcessMessage(m_hWnd, uMsg, wParam, lParam, &Ret))) { - switch (LOWORD(wParam)) - { - case IDM_TASKBARANDSTARTMENU: - DisplayProperties(); - break; - - case IDM_SEARCH: - SHFindFiles(NULL, NULL); - break; - - case IDM_HELPANDSUPPORT: - ExecResourceCmd(IDS_HELP_COMMAND); - break; - - case IDM_RUN: - DisplayRunFileDlg(); - break; - - /* FIXME: Handle these commands as well */ - case IDM_SYNCHRONIZE: - case IDM_DISCONNECT: - case IDM_UNDOCKCOMPUTER: - break; - - case IDM_LOGOFF: - LogoffWindowsDialog(m_hWnd); // FIXME: Maybe handle it in a similar way as DoExitWindows? - break; - - case IDM_SHUTDOWN: - DoExitWindows(); - break; - } + return HandleCommand(LOWORD(wParam)); } return Ret; }

1 0

[jimtabor] 72439: [NtUser] - Properly sync wine menu code. Attempt to fix CORE-11892.
by jimtabor＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: jimtabor Date: Tue Aug 23 16:33:44 2016 New Revision: 72439 URL: http://svn.reactos.org/svn/reactos?rev=72439&view=rev Log: [NtUser] - Properly sync wine menu code. Attempt to fix CORE-11892. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Tue Aug 23 16:33:44 2016 @@ -2596,7 +2596,7 @@ UINT u; item = menu->rgItems; - for (u = 0; u < menu->cItems; u++, item++) + for( u = menu->cItems; u > 0; u--, item++) { MENU_DrawMenuItem(wnd, menu, menu->spwndNotify, hdc, item, menu->cyMenu, FALSE, ODA_DRAWENTIRE);

1 0

[hbelusca] 72438: [CMAKE]: Update baseaddress_msvc.cmake with the updated scripts from CORE-11382 , after the recent translations of some of the message compiler files.
by hbelusca＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: hbelusca Date: Tue Aug 23 12:15:12 2016 New Revision: 72438 URL: http://svn.reactos.org/svn/reactos?rev=72438&view=rev Log: [CMAKE]: Update baseaddress_msvc.cmake with the updated scripts from CORE-11382 , after the recent translations of some of the message compiler files. Modified: trunk/reactos/sdk/cmake/baseaddress_msvc.cmake Modified: trunk/reactos/sdk/cmake/baseaddress_msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/baseaddress_msvc… ============================================================================== --- trunk/reactos/sdk/cmake/baseaddress_msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/baseaddress_msvc.cmake [iso-8859-1] Tue Aug 23 12:15:12 2016 @@ -1,346 +1,360 @@ -set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c7c0000) -set(baseaddress_msvcrt 0x7c750000) -set(baseaddress_advapi32 0x7c6e0000) -set(baseaddress_gdi32 0x7c690000) -set(baseaddress_user32 0x7c570000) -set(baseaddress_dhcpcsvc 0x7c530000) -set(baseaddress_dnsapi 0x7c4f0000) -set(baseaddress_icmp 0x7c4d0000) -set(baseaddress_iphlpapi 0x7c4a0000) -set(baseaddress_ws2_32 0x7c470000) -set(baseaddress_ws2help 0x7c450000) -set(baseaddress_shlwapi 0x7c3e0000) -set(baseaddress_rpcrt4 0x7c350000) -set(baseaddress_comctl32 0x7c250000) -set(baseaddress_ole32 0x7c150000) -set(baseaddress_winspool.drv 0x7c130000) -set(baseaddress_winmm 0x7c090000) -set(baseaddress_comdlg32 0x7bfc0000) -set(baseaddress_shell32 0x7b290000) -set(baseaddress_lz32 0x7b270000) -set(baseaddress_version 0x7b250000) -set(baseaddress_oleaut32 0x7b140000) -set(baseaddress_setupapi 0x7afc0000) -set(baseaddress_mpr 0x7af90000) -set(baseaddress_crypt32 0x7aed0000) -set(baseaddress_wininet 0x7ae50000) -set(baseaddress_urlmon 0x7adb0000) -set(baseaddress_psapi 0x7ad90000) -set(baseaddress_imm32 0x7ad60000) -set(baseaddress_msvfw32 0x7ad30000) -set(baseaddress_dbghelp 0x7acc0000) -set(baseaddress_devmgr 0x7ac40000) -set(baseaddress_msacm32 0x7ac10000) -set(baseaddress_netapi32 0x7abc0000) -set(baseaddress_powrprof 0x7aba0000) -set(baseaddress_secur32 0x7ab70000) -set(baseaddress_wintrust 0x7ab30000) -set(baseaddress_avicap32 0x7ab10000) -set(baseaddress_cabinet 0x7aad0000) -set(baseaddress_dsound 0x7aa70000) -set(baseaddress_glu32 0x7a9e0000) -set(baseaddress_opengl32 0x7a850000) -set(baseaddress_riched20 0x7a7d0000) -set(baseaddress_smdll 0x7a7b0000) -set(baseaddress_userenv 0x7a770000) -set(baseaddress_uxtheme 0x7a730000) -set(baseaddress_cryptui 0x7a6a0000) -set(baseaddress_csrsrv 0x7a670000) -set(baseaddress_basesrv 0x7a650000) -set(baseaddress_consrv 0x7a630000) -set(baseaddress_winsrv 0x7a590000) -set(baseaddress_dplayx 0x7a540000) -set(baseaddress_gdiplus 0x7a4c0000) -set(baseaddress_msimg32 0x7a4a0000) -set(baseaddress_mswsock 0x7a480000) -set(baseaddress_oledlg 0x7a440000) -set(baseaddress_rasapi32 0x7a420000) -set(baseaddress_rsaenh 0x7a3d0000) -set(baseaddress_samlib 0x7a3a0000) -set(baseaddress_sensapi 0x7a380000) -set(baseaddress_sfc_os 0x7a360000) -set(baseaddress_snmpapi 0x7a340000) -set(baseaddress_spoolss 0x7a310000) -set(baseaddress_usp10 0x7a2b0000) -set(baseaddress_acledit 0x7a290000) -set(baseaddress_aclui 0x7a260000) -set(baseaddress_activeds 0x7a240000) -set(baseaddress_actxprxy 0x7a140000) -set(baseaddress_advpack 0x7a110000) -set(baseaddress_amstream 0x7a0d0000) -set(baseaddress_atl 0x7a0a0000) -set(baseaddress_atl100 0x7a070000) -set(baseaddress_atl80 0x7a040000) -set(baseaddress_authz 0x7a020000) -set(baseaddress_avifil32 0x79fd0000) -set(baseaddress_batt 0x79fa0000) -set(baseaddress_bcrypt 0x79f80000) -set(baseaddress_beepmidi 0x79f60000) -set(baseaddress_browseui 0x79ee0000) -set(baseaddress_cards 0x79e20000) -set(baseaddress_cfgmgr32 0x79e00000) -set(baseaddress_clusapi 0x79de0000) -set(baseaddress_comcat 0x79dc0000) -set(baseaddress_compstui 0x79da0000) -set(baseaddress_console 0x79d30000) -set(baseaddress_credui 0x79cf0000) -set(baseaddress_crtdll 0x79ca0000) -set(baseaddress_cryptdlg 0x79c70000) -set(baseaddress_cryptdll 0x79c50000) -set(baseaddress_cryptnet 0x79c30000) -set(baseaddress_d3d8 0x79bf0000) -set(baseaddress_d3d8thk 0x79bd0000) -set(baseaddress_d3d9 0x79b80000) -set(baseaddress_d3dcompiler_43 0x79af0000) -set(baseaddress_d3drm 0x79a90000) -set(baseaddress_d3dwine 0x798c0000) -set(baseaddress_d3dx9_24 0x798a0000) -set(baseaddress_d3dx9_25 0x79870000) -set(baseaddress_d3dx9_26 0x79850000) -set(baseaddress_d3dx9_27 0x79830000) -set(baseaddress_d3dx9_28 0x79810000) -set(baseaddress_d3dx9_29 0x797f0000) -set(baseaddress_d3dx9_30 0x797d0000) -set(baseaddress_d3dx9_31 0x797b0000) -set(baseaddress_d3dx9_32 0x79790000) -set(baseaddress_d3dx9_33 0x79770000) -set(baseaddress_d3dx9_34 0x79750000) -set(baseaddress_d3dx9_35 0x79730000) -set(baseaddress_d3dx9_36 0x79690000) -set(baseaddress_d3dx9_37 0x79670000) -set(baseaddress_d3dx9_38 0x79650000) -set(baseaddress_d3dx9_39 0x79630000) -set(baseaddress_d3dx9_40 0x79610000) -set(baseaddress_d3dx9_41 0x795f0000) -set(baseaddress_d3dx9_42 0x795d0000) -set(baseaddress_d3dx9_43 0x795b0000) -set(baseaddress_d3dxof 0x79580000) -set(baseaddress_dciman32 0x79560000) -set(baseaddress_ddraw 0x794e0000) -set(baseaddress_deskadp 0x794b0000) -set(baseaddress_deskmon 0x79480000) -set(baseaddress_devcpux 0x79460000) -set(baseaddress_devenum 0x79430000) -set(baseaddress_dinput 0x793f0000) -set(baseaddress_dinput8 0x793d0000) -set(baseaddress_dmusic 0x79390000) -set(baseaddress_dplay 0x79370000) -set(baseaddress_dwmapi 0x79350000) -set(baseaddress_dxdiagn 0x79320000) -set(baseaddress_dxgi 0x792f0000) -set(baseaddress_faultrep 0x792d0000) -set(baseaddress_fltlib 0x792b0000) -set(baseaddress_fmifs 0x79290000) -set(baseaddress_fontext 0x79270000) -set(baseaddress_framebuf 0x79250000) -set(baseaddress_framebuf_new 0x79230000) -set(baseaddress_framedyn 0x79210000) -set(baseaddress_genincdata 0x791e0000) -set(baseaddress_getuname 0x78f10000) -set(baseaddress_hid 0x78ef0000) -set(baseaddress_hlink 0x78ec0000) -set(baseaddress_hnetcfg 0x78e90000) -set(baseaddress_httpapi 0x78e70000) -set(baseaddress_iccvid 0x78e50000) -set(baseaddress_ieframe 0x78dd0000) -set(baseaddress_iernonce 0x78db0000) -set(baseaddress_imagehlp 0x78d90000) -set(baseaddress_inetcomm 0x78d50000) -set(baseaddress_inetmib1 0x78d30000) -set(baseaddress_initpki 0x78d10000) -set(baseaddress_input 0x78cc0000) -set(baseaddress_inseng 0x78ca0000) -set(baseaddress_iologmsg 0x78c80000) -set(baseaddress_itircl 0x78c60000) -set(baseaddress_itss 0x78c30000) -set(baseaddress_jscript 0x78ba0000) -set(baseaddress_jsproxy 0x78b80000) -set(baseaddress_kbsdll 0x78b60000) -set(baseaddress_kdvbox 0x78b20000) -set(baseaddress_kernel32_vista 0x78b00000) -set(baseaddress_ksuser 0x78ae0000) -set(baseaddress_libjpeg 0x78a80000) -set(baseaddress_libpng 0x78a20000) -set(baseaddress_libtiff 0x78970000) -set(baseaddress_libxslt 0x787d0000) -set(baseaddress_loadperf 0x787b0000) -set(baseaddress_localspl 0x78780000) -set(baseaddress_localui 0x78750000) -set(baseaddress_lpk 0x78730000) -set(baseaddress_lsasrv 0x786f0000) -set(baseaddress_mapi32 0x786c0000) -set(baseaddress_mciavi32 0x78690000) -set(baseaddress_mcicda 0x78670000) -set(baseaddress_mciqtz32 0x78640000) -set(baseaddress_mciseq 0x78610000) -set(baseaddress_mciwave 0x785e0000) -set(baseaddress_mgmtapi 0x785c0000) -set(baseaddress_midimap 0x785a0000) -set(baseaddress_mlang 0x78570000) -set(baseaddress_mmdevapi 0x78540000) -set(baseaddress_mmdrv 0x78520000) -set(baseaddress_modemui 0x784b0000) -set(baseaddress_mprapi 0x78480000) -set(baseaddress_msafd 0x78450000) -set(baseaddress_mscat32 0x78430000) -set(baseaddress_mscms 0x78400000) -set(baseaddress_mscoree 0x783c0000) -set(baseaddress_msctf 0x78380000) -set(baseaddress_msdmo 0x78360000) -set(baseaddress_msftedit 0x78340000) -set(baseaddress_msgina 0x782c0000) -set(baseaddress_mshtml 0x78150000) -set(baseaddress_msi 0x78080000) -set(baseaddress_msimtf 0x78060000) -set(baseaddress_msisip 0x78040000) -set(baseaddress_mspatcha 0x78020000) -set(baseaddress_msports 0x77ff0000) -set(baseaddress_msrle32 0x77fc0000) -set(baseaddress_mssign32 0x77fa0000) -set(baseaddress_mssip32 0x77f80000) -set(baseaddress_mstask 0x77f50000) -set(baseaddress_msv1_0 0x77f30000) -set(baseaddress_msvcrt20 0x77eb0000) -set(baseaddress_msvcrt40 0x77e30000) -set(baseaddress_msvidc32 0x77e10000) -set(baseaddress_msxml 0x77de0000) -set(baseaddress_msxml2 0x77db0000) -set(baseaddress_msxml3 0x77b90000) -set(baseaddress_msxml4 0x77b50000) -set(baseaddress_msxml6 0x77b10000) -set(baseaddress_mycomput 0x77af0000) -set(baseaddress_nddeapi 0x77ad0000) -set(baseaddress_netcfgx 0x77a60000) -set(baseaddress_netevent 0x77a40000) -set(baseaddress_netid 0x77a00000) -set(baseaddress_netshell 0x779a0000) -set(baseaddress_newdev 0x77950000) -set(baseaddress_npptools 0x77930000) -set(baseaddress_ntdsapi 0x77910000) -set(baseaddress_ntlanman 0x778f0000) -set(baseaddress_ntmarta 0x778d0000) -set(baseaddress_ntobjshex 0x77850000) -set(baseaddress_ntprint 0x77830000) -set(baseaddress_objsel 0x77810000) -set(baseaddress_odbc32 0x777e0000) -set(baseaddress_odbccp32 0x777c0000) -set(baseaddress_oleacc 0x77770000) -set(baseaddress_olecli32 0x77750000) -set(baseaddress_olepro32 0x77730000) -set(baseaddress_olesvr32 0x77710000) -set(baseaddress_olethk32 0x776f0000) -set(baseaddress_pdh 0x776c0000) -set(baseaddress_pidgen 0x776a0000) -set(baseaddress_printui 0x77680000) -set(baseaddress_propsys 0x77650000) -set(baseaddress_pstorec 0x77630000) -set(baseaddress_qedit 0x77600000) -set(baseaddress_qmgr 0x775d0000) -set(baseaddress_qmgrprxy 0x77590000) -set(baseaddress_quartz 0x774b0000) -set(baseaddress_query 0x77490000) -set(baseaddress_rasadhlp 0x77470000) -set(baseaddress_rasdlg 0x772a0000) -set(baseaddress_rasman 0x77270000) -set(baseaddress_resutils 0x77250000) -set(baseaddress_riched32 0x77230000) -set(baseaddress_rsabase 0x77210000) -set(baseaddress_rshell 0x771c0000) -set(baseaddress_samsrv 0x77170000) -set(baseaddress_sccbase 0x77150000) -set(baseaddress_schannel 0x77120000) -set(baseaddress_schedsvc 0x77100000) -set(baseaddress_scrrun 0x770c0000) -set(baseaddress_security 0x770a0000) -set(baseaddress_serialui 0x77080000) -set(baseaddress_sfc 0x77060000) -set(baseaddress_shdoclc 0x77020000) -set(baseaddress_shdocvw 0x76fe0000) -set(baseaddress_shfolder 0x76fc0000) -set(baseaddress_shimgvw 0x76f80000) -set(baseaddress_slayer 0x76f50000) -set(baseaddress_slbcsp 0x76f30000) -set(baseaddress_sndblst 0x76f10000) -set(baseaddress_softpub 0x76ef0000) -set(baseaddress_srclient 0x76ed0000) -set(baseaddress_srvsvc 0x76ea0000) -set(baseaddress_sti 0x76e70000) -set(baseaddress_stobject 0x76e20000) -set(baseaddress_streamci 0x76e00000) -set(baseaddress_sxs 0x76de0000) -set(baseaddress_syssetup 0x76d40000) -set(baseaddress_t2embed 0x76d20000) -set(baseaddress_tapi32 0x76cf0000) -set(baseaddress_tapiui 0x76c70000) -set(baseaddress_testvdd 0x76c50000) -set(baseaddress_themeui 0x76c30000) -set(baseaddress_traffic 0x76c10000) -set(baseaddress_twain_32 0x76bf0000) -set(baseaddress_uext2 0x76bc0000) -set(baseaddress_ufat 0x76ba0000) -set(baseaddress_ufatx 0x76b80000) -set(baseaddress_umpnpmgr 0x76b50000) -set(baseaddress_untfs 0x76b30000) -set(baseaddress_updspapi 0x76b10000) -set(baseaddress_url 0x76af0000) -set(baseaddress_vbscript 0x76a90000) -set(baseaddress_vdmdbg 0x76a70000) -set(baseaddress_wbemdisp 0x76a40000) -set(baseaddress_wbemprox 0x76a00000) -set(baseaddress_windowscodecs 0x76960000) -set(baseaddress_windowscodecsext 0x76940000) -set(baseaddress_winfax 0x76920000) -set(baseaddress_wing32 0x76900000) -set(baseaddress_winhttp 0x768c0000) -set(baseaddress_winscard 0x768a0000) -set(baseaddress_winsta 0x76870000) -set(baseaddress_wkssvc 0x76850000) -set(baseaddress_wlanapi 0x76830000) -set(baseaddress_wldap32 0x76800000) -set(baseaddress_wlnotify 0x767e0000) -set(baseaddress_wmi 0x767c0000) -set(baseaddress_wmisvc 0x767a0000) -set(baseaddress_wmiutils 0x76770000) -set(baseaddress_ws2_32_new 0x76740000) -set(baseaddress_wshirda 0x76720000) -set(baseaddress_wshtcpip 0x76700000) -set(baseaddress_wsock32 0x766e0000) -set(baseaddress_wtsapi32 0x766c0000) -set(baseaddress_wuapi 0x76690000) -set(baseaddress_xinput1_1 0x76670000) -set(baseaddress_xinput1_2 0x76650000) -set(baseaddress_xinput1_3 0x76630000) -set(baseaddress_xinput9_1_0 0x76610000) -set(baseaddress_xmllite 0x765e0000) -set(baseaddress_access 0x76570000) -set(baseaddress_appwiz 0x76500000) -set(baseaddress_cmicpl 0x764d0000) -set(baseaddress_desk 0x76450000) -set(baseaddress_hdwwiz 0x763d0000) -set(baseaddress_hhctrl 0x76390000) -set(baseaddress_imaadp32.acm 0x76370000) -set(baseaddress_inetcpl 0x762f0000) -set(baseaddress_intl 0x76290000) -set(baseaddress_joy 0x76250000) -set(baseaddress_main 0x761b0000) -set(baseaddress_mmsys 0x760c0000) -set(baseaddress_msacm32.drv 0x76090000) -set(baseaddress_msadp32.acm 0x76070000) -set(baseaddress_msg711.acm 0x76050000) -set(baseaddress_msgsm32.acm 0x76030000) -set(baseaddress_msisys 0x76010000) -set(baseaddress_ncpa 0x75ff0000) -set(baseaddress_odbccp32i 0x75fd0000) -set(baseaddress_powercfg 0x75f70000) -set(baseaddress_sysdm 0x75ea0000) -set(baseaddress_telephon 0x75e80000) -set(baseaddress_timedate 0x75e30000) -set(baseaddress_usrmgr 0x75de0000) -set(baseaddress_wdmaud.drv 0x75c40000) -set(baseaddress_wined3dcfg 0x75c10000) -set(baseaddress_winemp3.acm 0x75ba0000) -set(baseaddress_wshom 0x75b70000) -set(baseaddress_fusion 0x75a00000) -set(baseaddress_fusion_1_1 0x759e0000) -set(baseaddress_fusion_2_0 0x759b0000) +set(baseaddress_ntdll 0x7c920000) +set(baseaddress_kernel32 0x7c790000) +set(baseaddress_msvcrt 0x7c720000) +set(baseaddress_advapi32 0x7c6b0000) +set(baseaddress_gdi32 0x7c660000) +set(baseaddress_user32 0x7c560000) +set(baseaddress_dhcpcsvc 0x7c520000) +set(baseaddress_dnsapi 0x7c4e0000) +set(baseaddress_icmp 0x7c4c0000) +set(baseaddress_iphlpapi 0x7c490000) +set(baseaddress_ws2_32 0x7c460000) +set(baseaddress_ws2help 0x7c440000) +set(baseaddress_shlwapi 0x7c3e0000) +set(baseaddress_rpcrt4 0x7c350000) +set(baseaddress_comctl32 0x7c240000) +set(baseaddress_ole32 0x7c130000) +set(baseaddress_winspool.drv 0x7c110000) +set(baseaddress_winmm 0x7c070000) +set(baseaddress_comdlg32 0x7bfa0000) +set(baseaddress_shell32 0x7b6d0000) +set(baseaddress_lz32 0x7b6b0000) +set(baseaddress_version 0x7b690000) +set(baseaddress_oleaut32 0x7b580000) +set(baseaddress_setupapi 0x7b460000) +set(baseaddress_mpr 0x7b430000) +set(baseaddress_crypt32 0x7b370000) +set(baseaddress_wininet 0x7b2f0000) +set(baseaddress_urlmon 0x7b250000) +set(baseaddress_psapi 0x7b230000) +set(baseaddress_imm32 0x7b200000) +set(baseaddress_msvfw32 0x7b1c0000) +set(baseaddress_dbghelp 0x7b150000) +set(baseaddress_devmgr 0x7b0b0000) +set(baseaddress_msacm32 0x7b080000) +set(baseaddress_netapi32 0x7b030000) +set(baseaddress_powrprof 0x7b010000) +set(baseaddress_secur32 0x7afe0000) +set(baseaddress_wintrust 0x7afa0000) +set(baseaddress_avicap32 0x7af80000) +set(baseaddress_cabinet 0x7af40000) +set(baseaddress_dsound 0x7aee0000) +set(baseaddress_glu32 0x7ae70000) +set(baseaddress_opengl32 0x7ad20000) +set(baseaddress_riched20 0x7aca0000) +set(baseaddress_smdll 0x7ac80000) +set(baseaddress_userenv 0x7ac40000) +set(baseaddress_uxtheme 0x7ac00000) +set(baseaddress_cryptui 0x7ab70000) +set(baseaddress_csrsrv 0x7ab40000) +set(baseaddress_basesrv 0x7ab20000) +set(baseaddress_winsrv 0x7aac0000) +set(baseaddress_dplayx 0x7aa70000) +set(baseaddress_gdiplus 0x7a9f0000) +set(baseaddress_msimg32 0x7a9d0000) +set(baseaddress_mswsock 0x7a9b0000) +set(baseaddress_oledlg 0x7a970000) +set(baseaddress_rasapi32 0x7a950000) +set(baseaddress_rsaenh 0x7a900000) +set(baseaddress_samlib 0x7a8d0000) +set(baseaddress_sensapi 0x7a8b0000) +set(baseaddress_sfc_os 0x7a890000) +set(baseaddress_snmpapi 0x7a870000) +set(baseaddress_spoolss 0x7a840000) +set(baseaddress_usp10 0x7a7e0000) +set(baseaddress_aclayers 0x7a7c0000) +set(baseaddress_acledit 0x7a7a0000) +set(baseaddress_aclui 0x7a770000) +set(baseaddress_acppage 0x7a740000) +set(baseaddress_activeds 0x7a720000) +set(baseaddress_actxprxy 0x7a610000) +set(baseaddress_advapi32_vista 0x7a5f0000) +set(baseaddress_advpack 0x7a5c0000) +set(baseaddress_amstream 0x7a590000) +set(baseaddress_apphelp 0x7a560000) +set(baseaddress_atl 0x7a530000) +set(baseaddress_atl100 0x7a500000) +set(baseaddress_atl80 0x7a4d0000) +set(baseaddress_authz 0x7a4b0000) +set(baseaddress_avifil32 0x7a460000) +set(baseaddress_batt 0x7a440000) +set(baseaddress_bcrypt 0x7a420000) +set(baseaddress_beepmidi 0x7a400000) +set(baseaddress_browseui 0x7a380000) +set(baseaddress_cards 0x7a2c0000) +set(baseaddress_cfgmgr32 0x7a2a0000) +set(baseaddress_clusapi 0x7a280000) +set(baseaddress_comcat 0x7a260000) +set(baseaddress_compstui 0x7a240000) +set(baseaddress_console 0x7a200000) +set(baseaddress_credui 0x7a1c0000) +set(baseaddress_crtdll 0x7a180000) +set(baseaddress_cryptdlg 0x7a150000) +set(baseaddress_cryptdll 0x7a130000) +set(baseaddress_cryptnet 0x7a110000) +set(baseaddress_d3d8 0x7a0d0000) +set(baseaddress_d3d8thk 0x7a0b0000) +set(baseaddress_d3d9 0x7a060000) +set(baseaddress_d3dcompiler_43 0x79fd0000) +set(baseaddress_d3drm 0x79f70000) +set(baseaddress_d3dwine 0x79d90000) +set(baseaddress_d3dx9_24 0x79d70000) +set(baseaddress_d3dx9_25 0x79d40000) +set(baseaddress_d3dx9_26 0x79d20000) +set(baseaddress_d3dx9_27 0x79d00000) +set(baseaddress_d3dx9_28 0x79ce0000) +set(baseaddress_d3dx9_29 0x79cc0000) +set(baseaddress_d3dx9_30 0x79ca0000) +set(baseaddress_d3dx9_31 0x79c80000) +set(baseaddress_d3dx9_32 0x79c60000) +set(baseaddress_d3dx9_33 0x79c40000) +set(baseaddress_d3dx9_34 0x79c20000) +set(baseaddress_d3dx9_35 0x79c00000) +set(baseaddress_d3dx9_36 0x79b60000) +set(baseaddress_d3dx9_37 0x79b40000) +set(baseaddress_d3dx9_38 0x79b20000) +set(baseaddress_d3dx9_39 0x79b00000) +set(baseaddress_d3dx9_40 0x79ae0000) +set(baseaddress_d3dx9_41 0x79ac0000) +set(baseaddress_d3dx9_42 0x79aa0000) +set(baseaddress_d3dx9_43 0x79a80000) +set(baseaddress_d3dxof 0x79a50000) +set(baseaddress_dciman32 0x79a30000) +set(baseaddress_ddraw 0x799b0000) +set(baseaddress_deskadp 0x79980000) +set(baseaddress_deskmon 0x79960000) +set(baseaddress_devcpux 0x79940000) +set(baseaddress_devenum 0x79910000) +set(baseaddress_dinput 0x798d0000) +set(baseaddress_dinput8 0x798b0000) +set(baseaddress_dmusic 0x79880000) +set(baseaddress_dplay 0x79860000) +set(baseaddress_dxdiagn 0x79830000) +set(baseaddress_esent 0x79810000) +set(baseaddress_faultrep 0x797f0000) +set(baseaddress_fltlib 0x797d0000) +set(baseaddress_fmifs 0x797b0000) +set(baseaddress_fontext 0x79790000) +set(baseaddress_fontsub 0x79770000) +set(baseaddress_framebuf 0x79750000) +set(baseaddress_framebuf_new 0x79730000) +set(baseaddress_framedyn 0x79710000) +set(baseaddress_genincdata 0x796e0000) +set(baseaddress_getuname 0x79410000) +set(baseaddress_hid 0x793f0000) +set(baseaddress_hlink 0x793c0000) +set(baseaddress_hnetcfg 0x79390000) +set(baseaddress_httpapi 0x79370000) +set(baseaddress_iccvid 0x79350000) +set(baseaddress_ieframe 0x792d0000) +set(baseaddress_iernonce 0x792a0000) +set(baseaddress_imagehlp 0x79280000) +set(baseaddress_inetcomm 0x79240000) +set(baseaddress_inetmib1 0x79220000) +set(baseaddress_initpki 0x79200000) +set(baseaddress_input 0x791a0000) +set(baseaddress_inseng 0x79180000) +set(baseaddress_iologmsg 0x79160000) +set(baseaddress_itircl 0x79140000) +set(baseaddress_itss 0x79110000) +set(baseaddress_jscript 0x79080000) +set(baseaddress_jsproxy 0x79060000) +set(baseaddress_kbsdll 0x79040000) +set(baseaddress_kernel32_vista 0x79020000) +set(baseaddress_ksuser 0x79000000) +set(baseaddress_libjpeg 0x78fa0000) +set(baseaddress_libpng 0x78f40000) +set(baseaddress_libtiff 0x78ed0000) +set(baseaddress_libxslt 0x78da0000) +set(baseaddress_loadperf 0x78d80000) +set(baseaddress_localspl 0x78d50000) +set(baseaddress_localui 0x78d20000) +set(baseaddress_lpk 0x78d00000) +set(baseaddress_lsasrv 0x78cb0000) +set(baseaddress_mapi32 0x78c80000) +set(baseaddress_mciavi32 0x78c50000) +set(baseaddress_mcicda 0x78c30000) +set(baseaddress_mciqtz32 0x78c00000) +set(baseaddress_mciseq 0x78bd0000) +set(baseaddress_mciwave 0x78ba0000) +set(baseaddress_mgmtapi 0x78b80000) +set(baseaddress_midimap 0x78b60000) +set(baseaddress_mlang 0x78b30000) +set(baseaddress_mmdrv 0x78b10000) +set(baseaddress_modemui 0x78aa0000) +set(baseaddress_mprapi 0x78a80000) +set(baseaddress_msafd 0x78a50000) +set(baseaddress_mscat32 0x78a30000) +set(baseaddress_mscms 0x78a00000) +set(baseaddress_mscoree 0x789c0000) +set(baseaddress_msctf 0x78980000) +set(baseaddress_msdmo 0x78960000) +set(baseaddress_msftedit 0x78940000) +set(baseaddress_msgina 0x788c0000) +set(baseaddress_mshtml 0x78740000) +set(baseaddress_msi 0x78660000) +set(baseaddress_msimtf 0x78640000) +set(baseaddress_msisip 0x78620000) +set(baseaddress_mspatcha 0x78600000) +set(baseaddress_msports 0x785d0000) +set(baseaddress_msrle32 0x785a0000) +set(baseaddress_mssign32 0x78580000) +set(baseaddress_mssip32 0x78560000) +set(baseaddress_mstask 0x78530000) +set(baseaddress_msv1_0 0x78510000) +set(baseaddress_msvcrt_crt_dll_startup 0x784f0000) +set(baseaddress_msvcrt20 0x78470000) +set(baseaddress_msvcrt40 0x783f0000) +set(baseaddress_msvidc32 0x783d0000) +set(baseaddress_msxml 0x783a0000) +set(baseaddress_msxml2 0x78370000) +set(baseaddress_msxml3 0x78190000) +set(baseaddress_msxml4 0x78150000) +set(baseaddress_msxml6 0x78110000) +set(baseaddress_mycomput 0x780f0000) +set(baseaddress_nddeapi 0x780d0000) +set(baseaddress_netcfgx 0x78060000) +set(baseaddress_netevent 0x78040000) +set(baseaddress_netid 0x78000000) +set(baseaddress_netshell 0x77f90000) +set(baseaddress_newdev 0x77f40000) +set(baseaddress_normaliz 0x77f20000) +set(baseaddress_notifyhook 0x77f00000) +set(baseaddress_npptools 0x77ee0000) +set(baseaddress_ntdsapi 0x77ec0000) +set(baseaddress_ntlanman 0x77ea0000) +set(baseaddress_ntmarta 0x77e80000) +set(baseaddress_ntobjshex 0x77e20000) +set(baseaddress_ntprint 0x77e00000) +set(baseaddress_objsel 0x77de0000) +set(baseaddress_odbc32 0x77db0000) +set(baseaddress_odbccp32 0x77d90000) +set(baseaddress_oleacc 0x77d40000) +set(baseaddress_olecli32 0x77d20000) +set(baseaddress_olepro32 0x77d00000) +set(baseaddress_olesvr32 0x77ce0000) +set(baseaddress_olethk32 0x77cc0000) +set(baseaddress_pdh 0x77c90000) +set(baseaddress_pidgen 0x77c70000) +set(baseaddress_pifmgr 0x77bf0000) +set(baseaddress_printui 0x77bd0000) +set(baseaddress_propsys 0x77ba0000) +set(baseaddress_pstorec 0x77b80000) +set(baseaddress_qedit 0x77b50000) +set(baseaddress_qmgr 0x77b20000) +set(baseaddress_qmgrprxy 0x77ae0000) +set(baseaddress_quartz 0x779f0000) +set(baseaddress_query 0x779d0000) +set(baseaddress_rasadhlp 0x779b0000) +set(baseaddress_rasdlg 0x777e0000) +set(baseaddress_rasman 0x777b0000) +set(baseaddress_resutils 0x77790000) +set(baseaddress_riched32 0x77770000) +set(baseaddress_rsabase 0x77750000) +set(baseaddress_rshell 0x77700000) +set(baseaddress_samsrv 0x776b0000) +set(baseaddress_sccbase 0x77690000) +set(baseaddress_schannel 0x77660000) +set(baseaddress_schedsvc 0x77640000) +set(baseaddress_scrrun 0x77600000) +set(baseaddress_security 0x775e0000) +set(baseaddress_serialui 0x775c0000) +set(baseaddress_sfc 0x775a0000) +set(baseaddress_shdoclc 0x77560000) +set(baseaddress_shdocvw 0x77530000) +set(baseaddress_shfolder 0x77510000) +set(baseaddress_shimgvw 0x774d0000) +set(baseaddress_slayer 0x774a0000) +set(baseaddress_slbcsp 0x77480000) +set(baseaddress_sndblst 0x77460000) +set(baseaddress_softpub 0x77440000) +set(baseaddress_srclient 0x77420000) +set(baseaddress_srvsvc 0x773f0000) +set(baseaddress_sti 0x773c0000) +set(baseaddress_stobject 0x77380000) +set(baseaddress_streamci 0x77360000) +set(baseaddress_sxs 0x77340000) +set(baseaddress_syssetup 0x772a0000) +set(baseaddress_t2embed 0x77280000) +set(baseaddress_tapi32 0x77250000) +set(baseaddress_tapiui 0x771d0000) +set(baseaddress_testvdd 0x771b0000) +set(baseaddress_themeui 0x77190000) +set(baseaddress_traffic 0x77170000) +set(baseaddress_twain_32 0x77150000) +set(baseaddress_ubtrfs 0x77130000) +set(baseaddress_uext2 0x77100000) +set(baseaddress_ufat 0x770d0000) +set(baseaddress_ufatx 0x770b0000) +set(baseaddress_uffs 0x77090000) +set(baseaddress_umpnpmgr 0x77060000) +set(baseaddress_untfs 0x77040000) +set(baseaddress_updspapi 0x77020000) +set(baseaddress_ureiserfs 0x77000000) +set(baseaddress_url 0x76fe0000) +set(baseaddress_vbscript 0x76f80000) +set(baseaddress_vdmdbg 0x76f60000) +set(baseaddress_vssapi 0x76f40000) +set(baseaddress_wbemdisp 0x76f10000) +set(baseaddress_wbemprox 0x76ed0000) +set(baseaddress_win32kdll 0x76eb0000) +set(baseaddress_win32kdll_2k3sp2 0x76e90000) +set(baseaddress_win32kdll_xpsp2 0x76e70000) +set(baseaddress_windowscodecs 0x76dc0000) +set(baseaddress_windowscodecsext 0x76da0000) +set(baseaddress_winfax 0x76d80000) +set(baseaddress_wing32 0x76d60000) +set(baseaddress_winhttp 0x76d20000) +set(baseaddress_winscard 0x76d00000) +set(baseaddress_winsta 0x76cd0000) +set(baseaddress_wkssvc 0x76cb0000) +set(baseaddress_wlanapi 0x76c90000) +set(baseaddress_wldap32 0x76c60000) +set(baseaddress_wmi 0x76c40000) +set(baseaddress_wmisvc 0x76c20000) +set(baseaddress_wmiutils 0x76bf0000) +set(baseaddress_wmvcore 0x76bc0000) +set(baseaddress_ws2_32_new 0x76b90000) +set(baseaddress_wshirda 0x76b70000) +set(baseaddress_wshtcpip 0x76b50000) +set(baseaddress_wsock32 0x76b30000) +set(baseaddress_wtsapi32 0x76b10000) +set(baseaddress_wuapi 0x76ae0000) +set(baseaddress_xinput1_1 0x76ac0000) +set(baseaddress_xinput1_2 0x76aa0000) +set(baseaddress_xinput1_3 0x76a80000) +set(baseaddress_xinput9_1_0 0x76a60000) +set(baseaddress_xmllite 0x76a30000) +set(baseaddress_access 0x769c0000) +set(baseaddress_appwiz 0x76950000) +set(baseaddress_cmicpl 0x76920000) +set(baseaddress_desk 0x768a0000) +set(baseaddress_hdwwiz 0x76830000) +set(baseaddress_hhctrl 0x767f0000) +set(baseaddress_imaadp32.acm 0x767d0000) +set(baseaddress_inetcpl 0x76780000) +set(baseaddress_intl 0x76720000) +set(baseaddress_joy 0x766f0000) +set(baseaddress_main 0x76670000) +set(baseaddress_mmsys 0x765b0000) +set(baseaddress_msacm32.drv 0x76580000) +set(baseaddress_msadp32.acm 0x76560000) +set(baseaddress_msg711.acm 0x76540000) +set(baseaddress_msgsm32.acm 0x76520000) +set(baseaddress_msisys 0x76500000) +set(baseaddress_ncpa 0x764e0000) +set(baseaddress_odbccp32i 0x764c0000) +set(baseaddress_powercfg 0x76460000) +set(baseaddress_sysdm 0x76390000) +set(baseaddress_telephon 0x76370000) +set(baseaddress_timedate 0x76300000) +set(baseaddress_usrmgr 0x762c0000) +set(baseaddress_wdmaud.drv 0x76130000) +set(baseaddress_wined3dcfg 0x76100000) +set(baseaddress_winemp3.acm 0x760a0000) +set(baseaddress_wshom 0x76070000) + +## From baseaddress.cmake (GCC) +set(baseaddress_fusion 0x73830000) +set(baseaddress_fusion_1_1 0x737f0000) +set(baseaddress_fusion_2_0 0x737b0000)

1 0

[zhu] 72437: Multi-threaded the server side of the TCP test.
by zhu＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: zhu Date: Tue Aug 23 02:58:27 2016 New Revision: 72437 URL: http://svn.reactos.org/svn/reactos?rev=72437&view=rev Log: Multi-threaded the server side of the TCP test. Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c [iso-8859-1] Tue Aug 23 02:58:27 2016 @@ -3,7 +3,7 @@ #include <winsock2.h> #define LENGTH 255 -#define NUM_CLIENTS 2 +#define NUM_CLIENTS 128 DWORD WINAPI ClientThreadMain(LPVOID lpParam) { SOCKET Sock; @@ -69,6 +69,8 @@ int wmain(int argc, LPWSTR argv[]) { WSADATA wsa; + SYSTEMTIME StartTime; + SYSTEMTIME EndTime; HANDLE ClientThreadHandles[NUM_CLIENTS]; DWORD ClientThreadIDs[NUM_CLIENTS]; @@ -82,6 +84,8 @@ printf("Windows Socket API Startup Failed: %d\n", WSAGetLastError()); return 1; } + + GetSystemTime(&StartTime); for (i = 0; i < NUM_CLIENTS; i++) { ClientThreadHandles[i] = CreateThread( @@ -100,11 +104,19 @@ WaitForMultipleObjects(NUM_CLIENTS, ClientThreadHandles, TRUE, INFINITE); + GetSystemTime(&EndTime); + + for (i = 0; i < NUM_CLIENTS; i++) { CloseHandle(ClientThreadHandles[i]); } fgets(buff, LENGTH, stdin); + printf("Elapsed: %d.%03d s\n", + EndTime.wSecond - StartTime.wSecond, EndTime.wMilliseconds - StartTime.wMilliseconds); + + fgets(buff, LENGTH, stdin); + return 0; } Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c [iso-8859-1] Tue Aug 23 02:58:27 2016 @@ -4,28 +4,77 @@ #define backlog 4 #define LENGTH 256 +struct ClientInfo { + int ClientID; + SOCKET ClientSock; +}; + +DWORD WINAPI ServerThreadMain(LPVOID lpParam) { + SOCKET ClientSock; + + struct ClientInfo *CInfo; + + char buff[LENGTH]; + + int count; + int ret; + + CInfo = (struct ClientInfo *)lpParam; + + count = CInfo->ClientID; + ClientSock = CInfo->ClientSock; + + printf("Connection established to client %d\n", count); + + ret = recv(ClientSock, buff, LENGTH, 0); + if (ret < 0) { + printf(" Receive failure on socket %d: %d\n", ClientSock, WSAGetLastError()); + return 1; + } + buff[ret] = '\0'; + printf(" Received %d-byte message from client %d: %s\n", ret, count, buff); + + ret = send(ClientSock, buff, ret, 0); + if (ret == SOCKET_ERROR) { + printf("Send failed: %d\n", WSAGetLastError()); + closesocket(ClientSock); + fgets(buff, LENGTH, stdin); + return 1; + } + printf("Message echoed\n"); + + closesocket(ClientSock); + + free(CInfo); + + return 0; +} + int wmain(int argc, LPWSTR argv[]) { - WSADATA wsa; + DWORD ServerThreadID; + WSADATA wsa; SOCKET ListenSock; SOCKET ClientSock; + + struct ClientInfo *CInfo; struct sockaddr_in ListenAddr; struct sockaddr_in ClientAddr; char buff[LENGTH]; - int ret; + int ret; int addrSize; int count; printf("Server startup\n"); - ret = WSAStartup(MAKEWORD(2, 2), &wsa); - if (ret != 0) { - printf("Windows Socket API Startup Failed: %d\n", WSAGetLastError()); + ret = WSAStartup(MAKEWORD(2, 2), &wsa); + if (ret != 0) { + printf("Windows Socket API Startup Failed: %d\n", WSAGetLastError()); fgets(buff, LENGTH, stdin); - return 1; - } + return 1; + } memset(&ListenAddr, 0, sizeof(struct sockaddr_in)); ListenAddr.sin_family = AF_INET; @@ -62,7 +111,6 @@ printf("Server listening socket is now listening\n"); count = 0; - // Only a single server handler for now. while (1) { addrSize = sizeof(struct sockaddr_in); memset(buff, 0, sizeof(buff)); @@ -73,26 +121,20 @@ closesocket(ListenSock); WSACleanup(); fgets(buff, LENGTH, stdin); - return 1; + exit(1); } - printf("Connection established to client %d\n", count); + + CInfo = malloc(sizeof(*CInfo)); + CInfo->ClientID = count; + CInfo->ClientSock = ClientSock; - ret = recv(ClientSock, buff, LENGTH, 0); - buff[LENGTH - 1] = '\0'; - printf(" Received %d-byte message from client %d: %s\n", ret, count, buff); - - ret = send(ClientSock, buff, ret, 0); - if (ret == SOCKET_ERROR) { - printf("Send failed: %d\n", WSAGetLastError()); - closesocket(ListenSock); - closesocket(ClientSock); - WSACleanup(); - fgets(buff, LENGTH, stdin); - return 1; - } - printf("Message echoed\n"); - - closesocket(ClientSock); + CreateThread( + NULL, + 0, + ServerThreadMain, + (LPVOID)CInfo, + 0, + &ServerThreadID); count++; } @@ -101,5 +143,5 @@ fgets(buff, LENGTH, stdin); - return 0; + return 0; }

1 0

[aandrejevic] 72436: [NTVDM:SVGA] Implement starting address extensions, scanline offset extensions and memory address extensions. No more 64 KB memory banks. The code now uses SVGA_BANK_SIZE (1 MB...
by aandrejevic＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: aandrejevic Date: Mon Aug 22 22:41:01 2016 New Revision: 72436 URL: http://svn.reactos.org/svn/reactos?rev=72436&view=rev Log: [NTVDM:SVGA] Implement starting address extensions, scanline offset extensions and memory address extensions. No more 64 KB memory banks. The code now uses SVGA_BANK_SIZE (1 MB) for everything. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Mon Aug 22 22:41:01 2016 @@ -333,6 +333,9 @@ static inline DWORD VgaTranslateReadAddress(DWORD Address) { DWORD Offset = LOWORD(Address - VgaGetVideoBaseAddress()); + DWORD ExtOffset = ((VgaGcRegisters[SVGA_GC_EXT_MODE_REG] & SVGA_GC_EXT_MODE_WND_B) && (Offset & (1 << 15))) + ? VgaGcRegisters[SVGA_GC_OFFSET_1_REG] + : VgaGcRegisters[SVGA_GC_OFFSET_0_REG]; BYTE Plane; /* Check for chain-4 and odd-even mode */ @@ -354,14 +357,23 @@ Plane = VgaGcRegisters[VGA_GC_READ_MAP_SEL_REG] & 0x03; } + if (ExtOffset) + { + /* Add the extended offset */ + Offset += ExtOffset << ((VgaGcRegisters[SVGA_GC_EXT_MODE_REG] & SVGA_GC_EXT_MODE_GRAN) ? 14 : 12); + } + /* Return the offset on plane 0 for read mode 1 */ if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_READ) return Offset; - else return Offset + Plane * VGA_BANK_SIZE; + else return Offset + Plane * SVGA_BANK_SIZE; } static inline DWORD VgaTranslateWriteAddress(DWORD Address) { DWORD Offset = LOWORD(Address - VgaGetVideoBaseAddress()); + DWORD ExtOffset = ((VgaGcRegisters[SVGA_GC_EXT_MODE_REG] & SVGA_GC_EXT_MODE_WND_B) && (Offset & (1 << 15))) + ? VgaGcRegisters[SVGA_GC_OFFSET_1_REG] + : VgaGcRegisters[SVGA_GC_OFFSET_0_REG]; /* Check for chain-4 and odd-even mode */ if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) @@ -373,6 +385,12 @@ { /* Clear the lowest bit since it's used to select odd/even */ Offset &= ~1; + } + + if (ExtOffset) + { + /* Add the extended offset */ + Offset += ExtOffset << ((VgaGcRegisters[SVGA_GC_EXT_MODE_REG] & SVGA_GC_EXT_MODE_GRAN) ? 14 : 12); } /* Return the offset on plane 0 */ @@ -748,11 +766,15 @@ { SHORT i, j, k; DWORD AddressSize = VgaGetAddressSize(); - DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + DWORD ScanlineSize = ((DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] + + (((DWORD)VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_OFFSET_BIT8) << 4)) * 2; BYTE PresetRowScan = VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] & 0x1F; BYTE BytePanning = (VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3; DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) + + ((VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_ADDR_BIT16) << 16) + + ((VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_ADDR_BITS1718) << 15) + + ((VgaCrtcRegisters[SVGA_CRTC_OVERLAY_REG] & SVGA_CRTC_EXT_ADDR_BIT19) << 12) + PresetRowScan * ScanlineSize + BytePanning; WORD LineCompare = VgaCrtcRegisters[VGA_CRTC_LINE_COMPARE_REG] @@ -845,7 +867,7 @@ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { /* One byte per pixel */ - PixelData = VgaMemory[(X % VGA_NUM_BANKS) * VGA_BANK_SIZE + PixelData = VgaMemory[(X % VGA_NUM_BANKS) * SVGA_BANK_SIZE + LOWORD((Address + (X / VGA_NUM_BANKS)) * AddressSize)]; } @@ -853,7 +875,7 @@ { /* 4-bits per pixel */ - PixelData = VgaMemory[(X % VGA_NUM_BANKS) * VGA_BANK_SIZE + PixelData = VgaMemory[(X % VGA_NUM_BANKS) * SVGA_BANK_SIZE + LOWORD((Address + (X / (VGA_NUM_BANKS * 2))) * AddressSize)]; @@ -886,8 +908,8 @@ */ DWORD BankNumber = (X / 4) % 2; DWORD Offset = Address + (X / 8); - BYTE LowPlaneData = VgaMemory[BankNumber * VGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; - BYTE HighPlaneData = VgaMemory[(BankNumber + 2) * VGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; + BYTE LowPlaneData = VgaMemory[BankNumber * SVGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; + BYTE HighPlaneData = VgaMemory[(BankNumber + 2) * SVGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; /* Extract the two bits from each plane */ LowPlaneData = (LowPlaneData >> (6 - ((X % 4) * 2))) & 0x03; @@ -909,7 +931,7 @@ for (k = 0; k < VGA_NUM_BANKS; k++) { /* The data is on plane k, 4 pixels per byte */ - BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE + BYTE PlaneData = VgaMemory[k * SVGA_BANK_SIZE + LOWORD((Address + (X / VGA_NUM_BANKS)) * AddressSize)]; @@ -929,7 +951,7 @@ for (k = 0; k < VGA_NUM_BANKS; k++) { - BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE + BYTE PlaneData = VgaMemory[k * SVGA_BANK_SIZE + LOWORD((Address + (X / (VGA_NUM_BANKS * 2))) * AddressSize)]; @@ -1068,7 +1090,7 @@ CharInfo.Char = VgaMemory[CurrentAddr]; /* Plane 1 holds the attribute */ - CharInfo.Attributes = VgaMemory[CurrentAddr + VGA_BANK_SIZE]; + CharInfo.Attributes = VgaMemory[CurrentAddr + SVGA_BANK_SIZE]; /* Now check if the resulting character data has changed */ if ((CharBuffer[i * CurrResolution.X + j].Char != CharInfo.Char) || @@ -1768,12 +1790,12 @@ if (VgaGcRegisters[VGA_GC_COLOR_COMPARE_REG] & (1 << j)) { /* Comparing with 11111111 */ - Result &= VgaMemory[j * VGA_BANK_SIZE + LOWORD(VideoAddress)]; + Result &= VgaMemory[j * SVGA_BANK_SIZE + LOWORD(VideoAddress)]; } else { /* Comparing with 00000000 */ - Result &= ~(VgaMemory[j * VGA_BANK_SIZE + LOWORD(VideoAddress)]); + Result &= ~(VgaMemory[j * SVGA_BANK_SIZE + LOWORD(VideoAddress)]); } } @@ -1784,9 +1806,9 @@ /* Load the latch registers */ VgaLatchRegisters[0] = VgaMemory[LOWORD(VideoAddress)]; - VgaLatchRegisters[1] = VgaMemory[VGA_BANK_SIZE + LOWORD(VideoAddress)]; - VgaLatchRegisters[2] = VgaMemory[(2 * VGA_BANK_SIZE) + LOWORD(VideoAddress)]; - VgaLatchRegisters[3] = VgaMemory[(3 * VGA_BANK_SIZE) + LOWORD(VideoAddress)]; + VgaLatchRegisters[1] = VgaMemory[SVGA_BANK_SIZE + LOWORD(VideoAddress)]; + VgaLatchRegisters[2] = VgaMemory[(2 * SVGA_BANK_SIZE) + LOWORD(VideoAddress)]; + VgaLatchRegisters[3] = VgaMemory[(3 * SVGA_BANK_SIZE) + LOWORD(VideoAddress)]; } BOOLEAN FASTCALL VgaWriteMemory(ULONG Address, PVOID Buffer, ULONG Size) @@ -1834,7 +1856,7 @@ } /* Copy the value to the VGA memory */ - VgaMemory[VideoAddress + j * VGA_BANK_SIZE] = VgaTranslateByteForWriting(BufPtr[i], j); + VgaMemory[VideoAddress + j * SVGA_BANK_SIZE] = VgaTranslateByteForWriting(BufPtr[i], j); } } @@ -1849,7 +1871,7 @@ VOID VgaWriteTextModeFont(UINT FontNumber, CONST UCHAR* FontData, UINT Height) { UINT i, j; - PUCHAR FontMemory = (PUCHAR)&VgaMemory[VGA_BANK_SIZE * VGA_FONT_BANK + (FontNumber * VGA_FONT_SIZE)]; + PUCHAR FontMemory = (PUCHAR)&VgaMemory[SVGA_BANK_SIZE * VGA_FONT_BANK + (FontNumber * VGA_FONT_SIZE)]; ASSERT(Height <= VGA_MAX_FONT_HEIGHT); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] Mon Aug 22 22:41:01 2016 @@ -187,6 +187,14 @@ #define VGA_CRTC_MODE_CONTROL_WRAP (1 << 5) #define VGA_CRTC_MODE_CONTROL_BYTE (1 << 6) #define VGA_CRTC_MODE_CONTROL_SYNC (1 << 7) + +/* CRTC extended display register bits */ +#define SVGA_CRTC_EXT_ADDR_BIT16 (1 << 0) +#define SVGA_CRTC_EXT_ADDR_BITS1718 ((1 << 2) | (1 << 3)) +#define SVGA_CRTC_EXT_OFFSET_BIT8 (1 << 4) + +/* CRTC extended overlay register bits */ +#define SVGA_CRTC_EXT_ADDR_BIT19 (1 << 7) enum { @@ -248,6 +256,10 @@ /* Graphics controller miscellaneous register bits */ #define VGA_GC_MISC_NOALPHA (1 << 0) #define VGA_GC_MISC_OE (1 << 1) + +/* Graphics controller extended mode register bits */ +#define SVGA_GC_EXT_MODE_WND_B (1 << 0) +#define SVGA_GC_EXT_MODE_GRAN (1 << 5) enum {

1 0

[jgardou] 72435: [KDGDB] - Implement setting and removing breakpoints - Implement single-stepping - Only get past the breakpoint instruction when it comes from RtlpBreakWithStatus - Implement writi...
by jgardou＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: jgardou Date: Mon Aug 22 22:24:30 2016 New Revision: 72435 URL: http://svn.reactos.org/svn/reactos?rev=72435&view=rev Log: [KDGDB] - Implement setting and removing breakpoints - Implement single-stepping - Only get past the breakpoint instruction when it comes from RtlpBreakWithStatus - Implement writing to memory - Always send the thread raising the exception to GDB to avoid confusing it - Let GDB find the program counter alone by querying the registers (support was already there before.) - Properly escape special characters on input Ladies and gentlemen : the almost-fully functional GDB stub. (still no real multi-process support :-( ) To enable , in CMakeCache.txt : - Set GDB:BOOL=TRUE - Set _WINKD_:BOOL=TRUE - Set KDBG:BOOL=FALSE To do : give GDB the list of loaded drivers. Loading ntoskrnl.exe symbols at 0x80801000 already does a good enough job. Default output is on COM1. Can be configure to any othe COM port with usual kernel options. Hope you'll like it as much as I do ;-) Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c trunk/reactos/drivers/base/kdgdb/gdb_receive.c trunk/reactos/drivers/base/kdgdb/gdb_send.c trunk/reactos/drivers/base/kdgdb/i386_sup.c trunk/reactos/drivers/base/kdgdb/kdcom.c trunk/reactos/drivers/base/kdgdb/kdgdb.h trunk/reactos/drivers/base/kdgdb/kdpacket.c Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_inp… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] Mon Aug 22 22:24:30 2016 @@ -9,6 +9,11 @@ /* LOCALS *********************************************************************/ static ULONG_PTR gdb_run_tid; +static struct +{ + ULONG_PTR Address; + ULONG Handle; +} BreakPointHandles[32]; /* GLOBALS ********************************************************************/ @@ -203,16 +208,15 @@ if (!Resuming) { + /* Report the idle thread */ +#if MONOPROCESS + ptr += sprintf(ptr, "1"); +#else + ptr += sprintf(gdb, "p1.1"); +#endif /* Initialize the entries */ CurrentProcessEntry = ProcessListHead->Flink; CurrentThreadEntry = NULL; - - /* Start with idle thread */ -#if MONOPROCESS - ptr = gdb_out + sprintf(gdb_out, "m1"); -#else - ptr = gdb_out + sprintf(gdb_out, "mp1.1"); -#endif FirstThread = FALSE; } @@ -306,8 +310,8 @@ Thread = find_thread(Pid, Tid); Process = CONTAINING_RECORD(Thread->Tcb.Process, EPROCESS, Pcb); #else - Pid = hex_to_pid(&gdb_input[2]); - Tid = hex_to_tid(strstr(gdb_input, ".") + 1); + Pid = hex_to_pid(&gdb_input[18]); + Tid = hex_to_tid(strstr(&gdb_input[18], ".") + 1); /* We cannot use PsLookupProcessThreadByCid as we could be running at any IRQL. * So loop. */ @@ -394,21 +398,23 @@ KDDBGPRINT("Wrong API number (%lu) after DbgKdReadVirtualMemoryApi request.\n", State->ApiNumber); } - /* Check status */ - if (!NT_SUCCESS(State->ReturnStatus)) + /* Check status. Allow to send partial data. */ + if (!MessageData->Length && !NT_SUCCESS(State->ReturnStatus)) send_gdb_ntstatus(State->ReturnStatus); else send_gdb_memory(MessageData->Buffer, MessageData->Length); KdpSendPacketHandler = NULL; KdpManipulateStateHandler = NULL; -#if !MONOPROCESS +#if MONOPROCESS + if (gdb_dbg_tid != 0) /* Reset the TLB */ +#else if ((gdb_dbg_pid != 0) && gdb_pid_to_handle(gdb_dbg_pid) != PsGetCurrentProcessId()) +#endif { __writecr3(PsGetCurrentProcess()->Pcb.DirectoryTableBase[0]); } -#endif } static @@ -427,8 +433,29 @@ MessageData->Length = 0; *MessageLength = 0; -#if !MONOPROCESS /* Set the TLB according to the process being read. Pid 0 means any process. */ +#if MONOPROCESS + if ((gdb_dbg_tid != 0) && gdb_tid_to_handle(gdb_dbg_tid) != PsGetCurrentThreadId()) + { + PETHREAD AttachedThread = find_thread(0, gdb_dbg_tid); + PKPROCESS AttachedProcess; + if (AttachedThread == NULL) + { + KDDBGPRINT("The current GDB debug thread is invalid!"); + send_gdb_packet("E03"); + return (KDSTATUS)-1; + } + + AttachedProcess = AttachedThread->Tcb.Process; + if (AttachedProcess == NULL) + { + KDDBGPRINT("The current GDB debug thread is invalid!"); + send_gdb_packet("E03"); + return (KDSTATUS)-1; + } + __writecr3(AttachedProcess->DirectoryTableBase[0]); + } +#else if ((gdb_dbg_pid != 0) && gdb_pid_to_handle(gdb_dbg_pid) != PsGetCurrentProcessId()) { PEPROCESS AttachedProcess = find_process(gdb_dbg_pid); @@ -436,7 +463,7 @@ { KDDBGPRINT("The current GDB debug thread is invalid!"); send_gdb_packet("E03"); - return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + return (KDSTATUS)-1; } __writecr3(AttachedProcess->Pcb.DirectoryTableBase[0]); } @@ -448,6 +475,388 @@ /* KD will reply with KdSendPacket. Catch it */ KdpSendPacketHandler = ReadMemorySendHandler; + return KdPacketReceived; +} + +static +void +WriteMemorySendHandler( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData) +{ + DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; + + if (PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) + { + // KdAssert + KDDBGPRINT("Wrong packet type (%lu) received after DbgKdWriteVirtualMemoryApi request.\n", PacketType); + while (1); + } + + if (State->ApiNumber != DbgKdWriteVirtualMemoryApi) + { + KDDBGPRINT("Wrong API number (%lu) after DbgKdWriteVirtualMemoryApi request.\n", State->ApiNumber); + } + + /* Check status */ + if (!NT_SUCCESS(State->ReturnStatus)) + send_gdb_ntstatus(State->ReturnStatus); + else + send_gdb_packet("OK"); + KdpSendPacketHandler = NULL; + KdpManipulateStateHandler = NULL; + +#if MONOPROCESS + if (gdb_dbg_tid != 0) + /* Reset the TLB */ +#else + if ((gdb_dbg_pid != 0) && gdb_pid_to_handle(gdb_dbg_pid) != PsGetCurrentProcessId()) +#endif + { + __writecr3(PsGetCurrentProcess()->Pcb.DirectoryTableBase[0]); + } +} + +static +KDSTATUS +handle_gdb_write_mem( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) +{ + /* Maximal input buffer is 0x1000. Each byte is encoded on two bytes by GDB */ + static UCHAR OutBuffer[0x800]; + ULONG BufferLength; + char* blob_ptr; + UCHAR* OutPtr; + + State->ApiNumber = DbgKdWriteVirtualMemoryApi; + State->ReturnStatus = STATUS_SUCCESS; /* ? */ + State->Processor = CurrentStateChange.Processor; + State->ProcessorLevel = CurrentStateChange.ProcessorLevel; + + /* Set the TLB according to the process being read. Pid 0 means any process. */ +#if MONOPROCESS + if ((gdb_dbg_tid != 0) && gdb_tid_to_handle(gdb_dbg_tid) != PsGetCurrentThreadId()) + { + PETHREAD AttachedThread = find_thread(0, gdb_dbg_tid); + PKPROCESS AttachedProcess; + if (AttachedThread == NULL) + { + KDDBGPRINT("The current GDB debug thread is invalid!"); + send_gdb_packet("E03"); + return (KDSTATUS)-1; + } + + AttachedProcess = AttachedThread->Tcb.Process; + if (AttachedProcess == NULL) + { + KDDBGPRINT("The current GDB debug thread is invalid!"); + send_gdb_packet("E03"); + return (KDSTATUS)-1; + } + __writecr3(AttachedProcess->DirectoryTableBase[0]); + } +#else + if ((gdb_dbg_pid != 0) && gdb_pid_to_handle(gdb_dbg_pid) != PsGetCurrentProcessId()) + { + PEPROCESS AttachedProcess = find_process(gdb_dbg_pid); + if (AttachedProcess == NULL) + { + KDDBGPRINT("The current GDB debug thread is invalid!"); + send_gdb_packet("E03"); + return (KDSTATUS)-1; + } + __writecr3(AttachedProcess->Pcb.DirectoryTableBase[0]); + } +#endif + + State->u.WriteMemory.TargetBaseAddress = hex_to_address(&gdb_input[1]); + BufferLength = hex_to_address(strstr(&gdb_input[1], ",") + 1); + if (BufferLength == 0) + { + /* Nothing to do */ + send_gdb_packet("OK"); + return (KDSTATUS)-1; + } + + State->u.WriteMemory.TransferCount = BufferLength; + MessageData->Length = BufferLength; + MessageData->Buffer = (CHAR*)OutBuffer; + + OutPtr = OutBuffer; + blob_ptr = strstr(strstr(&gdb_input[1], ",") + 1, ":") + 1; + while (BufferLength) + { + if (BufferLength >= 4) + { + *((ULONG*)OutPtr) = *((ULONG*)blob_ptr); + OutPtr += 4; + blob_ptr += 4; + BufferLength -= 4; + } + else if (BufferLength >= 2) + { + *((USHORT*)OutPtr) = *((USHORT*)blob_ptr); + OutPtr += 2; + blob_ptr += 2; + BufferLength -= 2; + } + else + { + *OutPtr++ = *blob_ptr++; + BufferLength--; + } + } + + /* KD will reply with KdSendPacket. Catch it */ + KdpSendPacketHandler = WriteMemorySendHandler; + + return KdPacketReceived; +} + +static +void +WriteBreakPointSendHandler( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData) +{ + DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; + + if (PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) + { + // KdAssert + KDDBGPRINT("Wrong packet type (%lu) received after DbgKdWriteBreakPointApi request.\n", PacketType); + while (1); + } + + if (State->ApiNumber != DbgKdWriteBreakPointApi) + { + KDDBGPRINT("Wrong API number (%lu) after DbgKdWriteBreakPointApi request.\n", State->ApiNumber); + } + + /* Check status */ + if (!NT_SUCCESS(State->ReturnStatus)) + { + KDDBGPRINT("Inserting breakpoint failed!\n"); + send_gdb_ntstatus(State->ReturnStatus); + } + else + { + /* Keep track of the address+handle couple */ + ULONG i; + for (i = 0; i < (sizeof(BreakPointHandles) / sizeof(BreakPointHandles[0])); i++) + { + if (BreakPointHandles[i].Address == 0) + { + BreakPointHandles[i].Address = (ULONG_PTR)State->u.WriteBreakPoint.BreakPointAddress; + BreakPointHandles[i].Handle = State->u.WriteBreakPoint.BreakPointHandle; + break; + } + } + send_gdb_packet("OK"); + } + KdpSendPacketHandler = NULL; + KdpManipulateStateHandler = NULL; +} + +static +KDSTATUS +handle_gdb_insert_breakpoint( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) +{ + State->ReturnStatus = STATUS_SUCCESS; /* ? */ + State->Processor = CurrentStateChange.Processor; + State->ProcessorLevel = CurrentStateChange.ProcessorLevel; + if (MessageData) + MessageData->Length = 0; + *MessageLength = 0; + + switch (gdb_input[1]) + { + case '0': + { + ULONG_PTR Address = hex_to_address(&gdb_input[3]); + ULONG i; + BOOLEAN HasFreeSlot = FALSE; + + KDDBGPRINT("Inserting breakpoint at %p.\n", (void*)Address); + + for (i = 0; i < (sizeof(BreakPointHandles) / sizeof(BreakPointHandles[0])); i++) + { + if (BreakPointHandles[i].Address == 0) + HasFreeSlot = TRUE; + } + + if (!HasFreeSlot) + { + /* We don't have a way to keep track of this break point. Fail. */ + KDDBGPRINT("No breakpoint slot available!\n"); + send_gdb_packet("E01"); + return (KDSTATUS)-1; + } + + State->ApiNumber = DbgKdWriteBreakPointApi; + State->u.WriteBreakPoint.BreakPointAddress = Address; + /* FIXME : ignoring all other Z0 arguments */ + + /* KD will reply with KdSendPacket. Catch it */ + KdpSendPacketHandler = WriteBreakPointSendHandler; + return KdPacketReceived; + } + } + + KDDBGPRINT("Unhandled 'Z' packet: %s\n", gdb_input); + send_gdb_packet("E01"); + return (KDSTATUS)-1; +} + +static +void +RestoreBreakPointSendHandler( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData) +{ + DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; + ULONG i; + + if (PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) + { + // KdAssert + KDDBGPRINT("Wrong packet type (%lu) received after DbgKdRestoreBreakPointApi request.\n", PacketType); + while (1); + } + + if (State->ApiNumber != DbgKdRestoreBreakPointApi) + { + KDDBGPRINT("Wrong API number (%lu) after DbgKdRestoreBreakPointApi request.\n", State->ApiNumber); + } + + /* We ignore failure here. If DbgKdRestoreBreakPointApi fails, + * this means that the breakpoint was already invalid for KD. So clean it up on our side. */ + for (i = 0; i < (sizeof(BreakPointHandles) / sizeof(BreakPointHandles[0])); i++) + { + if (BreakPointHandles[i].Handle == State->u.RestoreBreakPoint.BreakPointHandle) + { + BreakPointHandles[i].Address = 0; + BreakPointHandles[i].Handle = 0; + break; + } + } + + send_gdb_packet("OK"); + + KdpSendPacketHandler = NULL; + KdpManipulateStateHandler = NULL; +} + +static +KDSTATUS +handle_gdb_remove_breakpoint( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) +{ + State->ReturnStatus = STATUS_SUCCESS; /* ? */ + State->Processor = CurrentStateChange.Processor; + State->ProcessorLevel = CurrentStateChange.ProcessorLevel; + if (MessageData) + MessageData->Length = 0; + *MessageLength = 0; + + switch (gdb_input[1]) + { + case '0': + { + ULONG_PTR Address = hex_to_address(&gdb_input[3]); + ULONG i, Handle = 0; + + KDDBGPRINT("Removing breakpoint on %p.\n", (void*)Address); + + for (i = 0; i < (sizeof(BreakPointHandles) / sizeof(BreakPointHandles[0])); i++) + { + if (BreakPointHandles[i].Address == Address) + { + Handle = BreakPointHandles[i].Handle; + break; + } + } + + if (Handle == 0) + { + KDDBGPRINT("Received %s, but breakpoint was never inserted ?!\n", gdb_input); + send_gdb_packet("E01"); + return (KDSTATUS)-1; + } + + State->ApiNumber = DbgKdRestoreBreakPointApi; + State->u.RestoreBreakPoint.BreakPointHandle = Handle; + /* FIXME : ignoring all other z0 arguments */ + + /* KD will reply with KdSendPacket. Catch it */ + KdpSendPacketHandler = RestoreBreakPointSendHandler; + return KdPacketReceived; + } + } + + KDDBGPRINT("Unhandled 'Z' packet: %s\n", gdb_input); + send_gdb_packet("E01"); + return (KDSTATUS)-1; +} + +static +KDSTATUS +handle_gdb_c( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) +{ + /* Tell GDB everything is fine, we will handle it */ + send_gdb_packet("OK"); + + if (CurrentStateChange.NewState == DbgKdExceptionStateChange) + { + DBGKM_EXCEPTION64* Exception = &CurrentStateChange.u.Exception; + ULONG_PTR ProgramCounter = KdpGetContextPc(&CurrentContext); + + /* See if we should update the program counter */ + if (Exception && (Exception->ExceptionRecord.ExceptionCode == STATUS_BREAKPOINT) + && ProgramCounter == KdDebuggerDataBlock->BreakpointWithStatus.Pointer) + { + /* We must get past the breakpoint instruction */ + KdpSetContextPc(&CurrentContext, ProgramCounter + KD_BREAKPOINT_SIZE); + + SetContextManipulateHandler(State, MessageData, MessageLength, KdContext); + KdpManipulateStateHandler = ContinueManipulateStateHandler; + return KdPacketReceived; + } + } + + return ContinueManipulateStateHandler(State, MessageData, MessageLength, KdContext); +} + +static +KDSTATUS +handle_gdb_s( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) +{ + KDDBGPRINT("Single stepping.\n"); + /* Set CPU single step mode and continue */ + KdpSetSingleStep(&CurrentContext); + SetContextManipulateHandler(State, MessageData, MessageLength, KdContext); + KdpManipulateStateHandler = ContinueManipulateStateHandler; return KdPacketReceived; } @@ -464,36 +873,19 @@ if (gdb_input[5] == '?') { /* Report what we support */ - send_gdb_packet("vCont;c;C;s;S"); + send_gdb_packet("vCont;c;s"); return (KDSTATUS)-1; } if (strncmp(gdb_input, "vCont;c", 7) == 0) { - DBGKM_EXCEPTION64* Exception = NULL; - - /* Tell GDB everything is fine, we will handle it */ - send_gdb_packet("OK"); - - if (CurrentStateChange.NewState == DbgKdExceptionStateChange) - Exception = &CurrentStateChange.u.Exception; - - /* See if we should update the program counter (unlike windbg, gdb doesn't do it for us) */ - if (Exception && (Exception->ExceptionRecord.ExceptionCode == STATUS_BREAKPOINT) - && (Exception->ExceptionRecord.ExceptionInformation[0] == 0)) - { - ULONG_PTR ProgramCounter; - - /* So we must get past the breakpoint instruction */ - ProgramCounter = KdpGetContextPc(&CurrentContext); - KdpSetContextPc(&CurrentContext, ProgramCounter + KD_BREAKPOINT_SIZE); - - SetContextManipulateHandler(State, MessageData, MessageLength, KdContext); - KdpManipulateStateHandler = ContinueManipulateStateHandler; - return KdPacketReceived; - } - - return ContinueManipulateStateHandler(State, MessageData, MessageLength, KdContext); + return handle_gdb_c(State, MessageData, MessageLength, KdContext); + } + + if (strncmp(gdb_input, "vCont;s", 7) == 0) + { + + return handle_gdb_s(State, MessageData, MessageLength, KdContext); } } @@ -524,11 +916,14 @@ { case '?': /* Send the Status */ - gdb_send_exception(TRUE); + gdb_send_exception(); break; case '!': send_gdb_packet("OK"); break; + case 'c': + Status = handle_gdb_c(State, MessageData, MessageLength, KdContext); + break; case 'g': gdb_send_registers(); break; @@ -544,17 +939,28 @@ case 'q': handle_gdb_query(); break; + case 's': + Status = handle_gdb_s(State, MessageData, MessageLength, KdContext); + break; case 'T': handle_gdb_thread_alive(); break; case 'v': Status = handle_gdb_v(State, MessageData, MessageLength, KdContext); break; + case 'X': + Status = handle_gdb_write_mem(State, MessageData, MessageLength, KdContext); + break; + case 'z': + Status = handle_gdb_remove_breakpoint(State, MessageData, MessageLength, KdContext); + break; + case 'Z': + Status = handle_gdb_insert_breakpoint(State, MessageData, MessageLength, KdContext); + break; default: - /* We don't know how to handle this request. Maybe this is something for KD */ - State->ReturnStatus = STATUS_NOT_SUPPORTED; + /* We don't know how to handle this request. */ KDDBGPRINT("Unsupported GDB command: %s.\n", gdb_input); - return KdPacketReceived; + send_gdb_packet(""); } } while (Status == (KDSTATUS)-1); Modified: trunk/reactos/drivers/base/kdgdb/gdb_receive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_rec… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_receive.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_receive.c [iso-8859-1] Mon Aug 22 22:24:30 2016 @@ -30,7 +30,7 @@ NTAPI gdb_receive_packet(_Inout_ PKD_CONTEXT KdContext) { - char* ByteBuffer = gdb_input; + UCHAR* ByteBuffer = (UCHAR*)gdb_input; UCHAR Byte; KDSTATUS Status; CHAR CheckSum = 0, ReceivedCheckSum; @@ -60,9 +60,18 @@ *ByteBuffer = '\0'; break; } - + CheckSum += (CHAR)Byte; + + /* See if we should escape */ + if (Byte == 0x7d) + { + Status = KdpReceiveByte(&Byte); + if (Status != KdPacketReceived) + return Status; + CheckSum += (CHAR)Byte; + Byte ^= 0x20; + } *ByteBuffer++ = Byte; - CheckSum += (CHAR)Byte; } /* Get Check sum (two bytes) */ @@ -80,6 +89,7 @@ if (ReceivedCheckSum != CheckSum) { /* Do not acknowledge to GDB */ + KDDBGPRINT("Check sums don't match!"); KdpSendByte('-'); return KdPacketNeedsResend; } Modified: trunk/reactos/drivers/base/kdgdb/gdb_send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_sen… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] Mon Aug 22 22:24:30 2016 @@ -168,7 +168,7 @@ } void -gdb_send_exception(BOOLEAN WithThread) +gdb_send_exception() { char gdb_out[1024]; char* ptr = gdb_out; @@ -184,20 +184,16 @@ } else ptr += sprintf(ptr, "05"); - if (WithThread) - { + #if MONOPROCESS - ptr += sprintf(ptr, "thread:%" PRIxPTR ";", - handle_to_gdb_tid(PsGetThreadId(Thread))); + ptr += sprintf(ptr, "thread:%" PRIxPTR ";", + handle_to_gdb_tid(PsGetThreadId(Thread))); #else - ptr += sprintf(ptr, "thread:p%" PRIxPTR ".%" PRIxPTR ";", - handle_to_gdb_pid(PsGetThreadProcessId(Thread)), - handle_to_gdb_tid(PsGetThreadId(Thread))); + ptr += sprintf(ptr, "thread:p%" PRIxPTR ".%" PRIxPTR ";", + handle_to_gdb_pid(PsGetThreadProcessId(Thread)), + handle_to_gdb_tid(PsGetThreadId(Thread))); #endif - } ptr += sprintf(ptr, "core:%x;", CurrentStateChange.Processor); - /* Add program counter */ - gdb_append_pc_to_exception(Thread, ptr); send_gdb_packet(gdb_out); } Modified: trunk/reactos/drivers/base/kdgdb/i386_sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/i386_su… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] Mon Aug 22 22:24:30 2016 @@ -251,28 +251,4 @@ } } -char* -gdb_append_pc_to_exception( - _In_ PETHREAD Thread, - _Inout_ char* ptr) -{ - /* Get EIP */ - unsigned short ptrSize; - unsigned char* EipPtr = thread_to_reg(Thread, EIP, &ptrSize); - - /* Print it */ - ptr += sprintf(ptr, "08:"); - *ptr++ = hex_chars[EipPtr[0] >> 4]; - *ptr++ = hex_chars[EipPtr[0] & 0xF]; - *ptr++ = hex_chars[EipPtr[1] >> 4]; - *ptr++ = hex_chars[EipPtr[1] & 0xF]; - *ptr++ = hex_chars[EipPtr[2] >> 4]; - *ptr++ = hex_chars[EipPtr[2] & 0xF]; - *ptr++ = hex_chars[EipPtr[3] >> 4]; - *ptr++ = hex_chars[EipPtr[3] & 0xF]; - *ptr++ = ';'; - *ptr++ = '\0'; - - return ptr; -} - + Modified: trunk/reactos/drivers/base/kdgdb/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] Mon Aug 22 22:24:30 2016 @@ -303,7 +303,6 @@ return KdPacketReceived; } - KDDBGPRINT("CpGetByte returned %u.\n", CpStatus); return KdPacketTimedOut; } Modified: trunk/reactos/drivers/base/kdgdb/kdgdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdgdb.h… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] Mon Aug 22 22:24:30 2016 @@ -19,7 +19,7 @@ #include <pstypes.h> -#define KDDEBUG /* uncomment to enable debugging this dll */ +//#define KDDEBUG /* uncomment to enable debugging this dll */ /* To undefine once https://sourceware.org/bugzilla/show_bug.cgi?id=17397 is resolved */ #define MONOPROCESS 1 @@ -83,7 +83,7 @@ void send_gdb_packet(_In_ CHAR* Buffer); void send_gdb_memory(_In_ VOID* Buffer, size_t Length); void gdb_send_debug_io(_In_ PSTRING String, _In_ BOOLEAN WithPrefix); -void gdb_send_exception(BOOLEAN WithThread); +void gdb_send_exception(void); void send_gdb_ntstatus(_In_ NTSTATUS Status); extern const char hex_chars[]; @@ -113,15 +113,18 @@ /* arch_sup.c */ extern void gdb_send_register(void); extern void gdb_send_registers(void); -extern char* gdb_append_pc_to_exception(_In_ PETHREAD Thread, _Inout_ char* ptr); /* Architecture specific defines. See ntoskrnl/include/internal/arch/ke.h */ #ifdef _M_IX86 +/* Handling passing over the breakpoint instruction */ # define KdpGetContextPc(Context) \ ((Context)->Eip) # define KdpSetContextPc(Context, ProgramCounter) \ ((Context)->Eip = (ProgramCounter)) # define KD_BREAKPOINT_SIZE sizeof(UCHAR) +/* Single step mode */ +# define KdpSetSingleStep(Context) \ + ((Context)->EFlags |= EFLAGS_TF) #else # error "Please define relevant macros for your architecture" #endif Modified: trunk/reactos/drivers/base/kdgdb/kdpacket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdpacke… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] Mon Aug 22 22:24:30 2016 @@ -160,7 +160,7 @@ #else gdb_dbg_pid = handle_to_gdb_pid(PsGetThreadProcessId(Thread)); #endif - gdb_send_exception(FALSE); + gdb_send_exception(); /* Next receive call will ask for the context */ KdpManipulateStateHandler = GetContextManipulateHandler; break; @@ -394,6 +394,13 @@ IN PSTRING MessageData, IN OUT PKD_CONTEXT KdContext) { + /* Override if we have some debug print from KD. */ + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + send_kd_debug_io((DBGKD_DEBUG_IO*)MessageHeader->Buffer, MessageData); + return; + } + /* Maybe we are in a send <-> receive loop that GDB doesn't need to know about */ if (KdpSendPacketHandler) {

1 0

[dchapyshev] 72434: [TRANSLATIONS] - Update Russian translation
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 21:18:42 2016 New Revision: 72434 URL: http://svn.reactos.org/svn/reactos?rev=72434&view=rev Log: [TRANSLATIONS] - Update Russian translation Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/shell/explorer/lang/ru-RU.rc trunk/reactos/sdk/include/reactos/mc/errcodes.mc trunk/reactos/sdk/include/reactos/mc/neteventmsg.mc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/shell/explorer/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/r… Modified: trunk/reactos/sdk/include/reactos/mc/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/mc/err… Modified: trunk/reactos/sdk/include/reactos/mc/neteventmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/mc/net…

1 0

[dchapyshev] 72433: [SDK] - It is partially translated into Russian * Now there is a possibility of the translation of *.mc of files
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 16:48:55 2016 New Revision: 72433 URL: http://svn.reactos.org/svn/reactos?rev=72433&view=rev Log: [SDK] - It is partially translated into Russian * Now there is a possibility of the translation of *.mc of files Modified: trunk/reactos/sdk/include/reactos/mc/errcodes.mc Modified: trunk/reactos/sdk/include/reactos/mc/errcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/mc/err… ============================================================================== --- trunk/reactos/sdk/include/reactos/mc/errcodes.mc [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/mc/errcodes.mc [iso-8859-1] Mon Aug 22 16:48:55 2016 @@ -11,7 +11,8 @@ WIN32=0x7:FACILITY_GENERAL ) -LanguageNames=(English=0x409:MSG00409) +LanguageNames=(English=0x409:MSG00409 + Russian=0x419:MSG00419) MessageId=0 Severity=Success @@ -20,6 +21,9 @@ Language=English ERROR_SUCCESS - The operation completed successfully. . +Language=Russian +ERROR_SUCCESS - ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð°. +. MessageId=1 Severity=Success @@ -28,6 +32,9 @@ Language=English ERROR_INVALID_FUNCTION - Incorrect function. . +Language=Russian +ERROR_INVALID_FUNCTION - ÐÐµÐ²ÐµÑÐ½Ð°Ñ ÑÑÐ½ÐºÑÐ¸Ñ. +. MessageId=2 Severity=Success @@ -36,6 +43,9 @@ Language=English ERROR_FILE_NOT_FOUND - The system cannot find the file specified. . +Language=Russian +ERROR_FILE_NOT_FOUND - ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÑÐ°Ð¹Ð». +. MessageId=3 Severity=Success @@ -44,6 +54,9 @@ Language=English ERROR_PATH_NOT_FOUND - The system cannot find the path specified. . +Language=Russian +ERROR_PATH_NOT_FOUND - Ð¡Ð¸ÑÑÐµÐ¼Ðµ Ð½Ðµ ÑÐ´Ð°ÐµÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð¿ÑÑÑ. +. MessageId=4 Severity=Success @@ -52,6 +65,9 @@ Language=English ERROR_TOO_MANY_OPEN_FILES - The system cannot open the file. . +Language=Russian +ERROR_TOO_MANY_OPEN_FILES - Ð¡Ð¸ÑÑÐµÐ¼Ðµ Ð½Ðµ ÑÐ´Ð°ÐµÑÑÑ Ð¾ÑÐºÑÑÑÑ ÑÐ°Ð¹Ð». +. MessageId=5 Severity=Success @@ -60,6 +76,9 @@ Language=English ERROR_ACCESS_DENIED - Access is denied. . +Language=Russian +ERROR_ACCESS_DENIED - ÐÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð² Ð´Ð¾ÑÑÑÐ¿Ðµ. +. MessageId=6 Severity=Success @@ -68,6 +87,9 @@ Language=English ERROR_INVALID_HANDLE - The handle is invalid. . +Language=Russian +ERROR_INVALID_HANDLE - ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð´ÐµÑÐºÑÐ¸Ð¿ÑÐ¾Ñ. +. MessageId=7 Severity=Success @@ -76,6 +98,9 @@ Language=English ERROR_ARENA_TRASHED - The storage control blocks were destroyed. . +Language=Russian +ERROR_ARENA_TRASHED - ÐÐ¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ñ ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑÐ¸Ðµ Ð±Ð»Ð¾ÐºÐ¸ Ð¿Ð°Ð¼ÑÑÐ¸. +. MessageId=8 Severity=Success @@ -84,6 +109,9 @@ Language=English ERROR_NOT_ENOUGH_MEMORY - Not enough storage is available to process this command. . +Language=Russian +ERROR_NOT_ENOUGH_MEMORY - ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸ Ð´Ð»Ñ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ. +. MessageId=9 Severity=Success @@ -92,6 +120,9 @@ Language=English ERROR_INVALID_BLOCK - The storage control block address is invalid. . +Language=Russian +ERROR_INVALID_BLOCK - ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð°Ð´ÑÐµÑ ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑÐµÐ³Ð¾ Ð±Ð»Ð¾ÐºÐ° Ð¿Ð°Ð¼ÑÑÐ¸. +. MessageId=10 Severity=Success @@ -100,6 +131,9 @@ Language=English ERROR_BAD_ENVIRONMENT - The environment is incorrect. . +Language=Russian +ERROR_BAD_ENVIRONMENT - ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð°Ñ ÑÑÐµÐ´Ð°. +. MessageId=11 Severity=Success @@ -108,6 +142,9 @@ Language=English ERROR_BAD_FORMAT - An attempt was made to load a program with an incorrect format. . +Language=Russian +ERROR_BAD_FORMAT - ÐÐ¾Ð¿ÑÑÐºÐ° Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ñ Ð½ÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¼ ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð¼. +. MessageId=12 Severity=Success @@ -116,6 +153,9 @@ Language=English ERROR_INVALID_ACCESS - The access code is invalid. . +Language=Russian +ERROR_INVALID_ACCESS - ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÐºÐ¾Ð´ Ð´Ð¾ÑÑÑÐ¿Ð°. +. MessageId=13 Severity=Success @@ -124,6 +164,9 @@ Language=English ERROR_INVALID_DATA - The data is invalid. . +Language=Russian +ERROR_INVALID_DATA - ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ. +. MessageId=14 Severity=Success @@ -132,6 +175,9 @@ Language=English ERROR_OUTOFMEMORY - Not enough storage is available to complete this operation. . +Language=Russian +ERROR_OUTOFMEMORY - ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸ Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸. +. MessageId=15 Severity=Success @@ -140,6 +186,9 @@ Language=English ERROR_INVALID_DRIVE - The system cannot find the drive specified. . +Language=Russian +ERROR_INVALID_DRIVE - Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾. +. MessageId=16 Severity=Success @@ -148,6 +197,9 @@ Language=English ERROR_CURRENT_DIRECTORY - The directory cannot be removed. . +Language=Russian +ERROR_CURRENT_DIRECTORY - ÐÑÐ¾Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ´Ð°Ð»ÐµÐ½. +. MessageId=17 Severity=Success @@ -156,6 +208,9 @@ Language=English ERROR_NOT_SAME_DEVICE - The system cannot move the file to a different disk drive. . +Language=Russian +ERROR_NOT_SAME_DEVICE - Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÑÐ°Ð¹Ð» Ð½Ð° Ð´ÑÑÐ³Ð¾Ðµ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾. +. MessageId=18 Severity=Success @@ -164,6 +219,9 @@ Language=English ERROR_NO_MORE_FILES - There are no more files. . +Language=Russian +ERROR_NO_MORE_FILES - Ð¤Ð°Ð¹Ð»Ð¾Ð² Ð±Ð¾Ð»ÑÑÐµ Ð½ÐµÑ. +. MessageId=19 Severity=Success @@ -172,6 +230,9 @@ Language=English ERROR_WRITE_PROTECT - The media is write protected. . +Language=Russian +ERROR_WRITE_PROTECT - ÐÐ¾ÑÐ¸ÑÐµÐ»Ñ Ð·Ð°ÑÐ¸ÑÐµÐ½ Ð¾Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸. +. MessageId=20 Severity=Success @@ -180,6 +241,9 @@ Language=English ERROR_BAD_UNIT - The system cannot find the device specified. . +Language=Russian +ERROR_BAD_UNIT - Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾. +. MessageId=21 Severity=Success @@ -188,6 +252,9 @@ Language=English ERROR_NOT_READY - The device is not ready. . +Language=Russian +ERROR_NOT_READY - Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ Ð³Ð¾ÑÐ¾Ð²Ð¾. +. MessageId=22 Severity=Success @@ -196,6 +263,9 @@ Language=English ERROR_BAD_COMMAND - The device does not recognize the command. . +Language=Russian +ERROR_BAD_COMMAND - Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ ÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°ÐµÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ. +. MessageId=23 Severity=Success @@ -204,6 +274,9 @@ Language=English ERROR_CRC - Data error (cyclic redundancy check). . +Language=Russian +ERROR_CRC - ÐÑÐ¸Ð±ÐºÐ° Ð² Ð´Ð°Ð½Ð½ÑÑ (ÑÐ¸ÐºÐ»Ð¸ÑÐµÑÐºÐ¸Ð¹ ÐºÐ¾Ð´ Ñ Ð¸Ð·Ð±ÑÑÐ¾ÑÐ½Ð¾ÑÑÑÑ). +. MessageId=24 Severity=Success @@ -212,6 +285,9 @@ Language=English ERROR_BAD_LENGTH - The program issued a command but the command length is incorrect. . +Language=Russian +ERROR_BAD_LENGTH - ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð²ÑÐ´Ð°Ð»Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ñ Ð½ÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ð¹ Ð´Ð»Ð¸Ð½Ð¾Ð¹. +. MessageId=25 Severity=Success @@ -220,6 +296,9 @@ Language=English ERROR_SEEK - The drive cannot locate a specific area or track on the disk. . +Language=Russian +ERROR_SEEK - ÐÐ¸ÑÐºÐ¾Ð²Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¾Ð±Ð½Ð°ÑÑÐ¶Ð¸ÑÑ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¸Ð»Ð¸ Ð´Ð¾ÑÐ¾Ð¶ÐºÑ. +. MessageId=26 Severity=Success @@ -228,6 +307,9 @@ Language=English ERROR_NOT_DOS_DISK - The specified disk or diskette cannot be accessed. . +Language=Russian +ERROR_NOT_DOS_DISK - ÐÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº Ð´Ð¸ÑÐºÑ Ð¸Ð»Ð¸ Ð´Ð¸ÑÐºÐµÑÐµ. +. MessageId=27 Severity=Success @@ -236,6 +318,9 @@ Language=English ERROR_SECTOR_NOT_FOUND - The drive cannot find the sector requested. . +Language=Russian +ERROR_SECTOR_NOT_FOUND - ÐÐ¸ÑÐºÐ¾Ð²Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¾Ð±Ð½Ð°ÑÑÐ¶Ð¸ÑÑ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¸Ð»Ð¸ Ð´Ð¾ÑÐ¾Ð¶ÐºÑ. +. MessageId=28 Severity=Success @@ -244,6 +329,9 @@ Language=English ERROR_OUT_OF_PAPER - The printer is out of paper. . +Language=Russian +ERROR_OUT_OF_PAPER - Ð Ð¿ÑÐ¸Ð½ÑÐµÑÐµ Ð·Ð°ÐºÐ¾Ð½ÑÐ¸Ð»Ð°ÑÑ Ð±ÑÐ¼Ð°Ð³Ð°. +. MessageId=29 Severity=Success @@ -252,6 +340,9 @@ Language=English ERROR_WRITE_FAULT - The system cannot write to the specified device. . +Language=Russian +ERROR_WRITE_FAULT - Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ð° ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾. +. MessageId=30 Severity=Success @@ -260,6 +351,9 @@ Language=English ERROR_READ_FAULT - The system cannot read from the specified device. . +Language=Russian +ERROR_READ_FAULT - Ð¡Ð¸ÑÑÐµÐ¼Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ ÑÑÐµÐ½Ð¸Ðµ Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°. +. MessageId=31 Severity=Success @@ -268,6 +362,9 @@ Language=English ERROR_GEN_FAILURE - A device attached to the system is not functioning. . +Language=Russian +ERROR_GEN_FAILURE - Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾, Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð½Ð¾Ðµ Ðº ÑÐ¸ÑÑÐµÐ¼Ðµ, Ð½Ðµ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ. +. MessageId=32 Severity=Success @@ -276,6 +373,9 @@ Language=English ERROR_SHARING_VIOLATION - The process cannot access the file because it is being used by another process. . +Language=Russian +ERROR_SHARING_VIOLATION - ÐÑÐ¾ÑÐµÑÑ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÐ°Ð¹Ð»Ñ, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ ÑÐ°Ð¹Ð» Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ð¼. +. MessageId=33 Severity=Success @@ -284,6 +384,9 @@ Language=English ERROR_LOCK_VIOLATION - The process cannot access the file because another process has locked a portion of the file. . +Language=Russian +ERROR_LOCK_VIOLATION - ÐÑÐ¾ÑÐµÑÑ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÐ°Ð¹Ð»Ñ, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ Ð´ÑÑÐ³Ð¾Ð¹ Ð¿ÑÐ¾ÑÐµÑÑ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð» ÑÐ°ÑÑÑ ÑÐ°Ð¹Ð»Ð°. +. MessageId=34 Severity=Success @@ -292,6 +395,9 @@ Language=English ERROR_WRONG_DISK - The wrong diskette is in the drive. Insert %2 (Volume Serial Number: %3) into drive %1. . +Language=Russian +ERROR_WRONG_DISK - ÐÑÑÐ°Ð²ÑÐµ Ð´ÑÑÐ³ÑÑ Ð´Ð¸ÑÐºÐµÑÑ. ÐÑÑÐ°Ð²ÑÑÐµ %2 (ÑÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐ¾Ð¼Ð°: %3) Ð² Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ %1. +. MessageId=36 Severity=Success @@ -300,6 +406,9 @@ Language=English ERROR_SHARING_BUFFER_EXCEEDED - Too many files opened for sharing. . +Language=Russian +ERROR_SHARING_BUFFER_EXCEEDED - Ð¡Ð»Ð¸ÑÐºÐ¾Ð¼ Ð¼Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¾ÑÐºÑÑÑÐ¾ Ð´Ð»Ñ ÑÐ¾Ð²Ð¼ÐµÑÑÐ½Ð¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ. +. MessageId=38 Severity=Success @@ -308,6 +417,9 @@ Language=English ERROR_HANDLE_EOF - Reached the end of the file. . +Language=Russian +ERROR_HANDLE_EOF - ÐÐ¾ÑÑÐ¸Ð³Ð½ÑÑ ÐºÐ¾Ð½ÐµÑ ÑÐ°Ð¹Ð»Ð°. +. MessageId=39 Severity=Success @@ -316,6 +428,9 @@ Language=English ERROR_HANDLE_DISK_FULL - The disk is full. . +Language=Russian +ERROR_HANDLE_DISK_FULL - ÐÑÑÑÑÑÑÐ²ÑÐµÑ Ð¼ÐµÑÑÐ¾ Ð½Ð° Ð´Ð¸ÑÐºÐµ. +. MessageId=50 Severity=Success @@ -324,14 +439,21 @@ Language=English ERROR_NOT_SUPPORTED - The request is not supported. . +Language=Russian +ERROR_NOT_SUPPORTED - ÐÐ°Ð¿ÑÐ¾Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ. +. MessageId=51 Severity=Success Facility=System SymbolicName=ERROR_REM_NOT_LIST Language=English -ERROR_REM_NOT_LIST - Windows cannot find the network path. Verify that the network path is correct and the destination computer is not busy or turned off. If Windows still cannot find the network path, contact your network administrator. -. +ERROR_REM_NOT_LIST - ReactOS cannot find the network path. Verify that the network path is correct and the destination computer is not busy or turned off. If ReactOS still cannot find the network path, contact your network administrator. +. +Language=Russian +ERROR_REM_NOT_LIST - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹ÑÐ¸ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð¿ÑÑÑ. Ð£Ð±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð¿ÑÑÑ ÑÐºÐ°Ð·Ð°Ð½ Ð²ÐµÑÐ½Ð¾, Ð° ÐºÐ¾Ð½ÐµÑÐ½ÑÐ¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð²ÐºÐ»ÑÑÐµÐ½ Ð¸ Ð½Ðµ Ð·Ð°Ð½ÑÑ. ÐÑÐ»Ð¸ ÑÐ¸ÑÑÐµÐ¼Ð° Ð²Ð½Ð¾Ð²Ñ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ Ð¿ÑÑÑ, Ð¾Ð±ÑÐ°ÑÐ¸ÑÐµÑÑ Ðº ÑÐµÑÐµÐ²Ð¾Ð¼Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÑ. +. + MessageId=52 Severity=Success @@ -340,6 +462,9 @@ Language=English ERROR_DUP_NAME - You were not connected because a duplicate name exists on the network. Go to System in the Control Panel to change the computer name and try again. . +Language=Russian +ERROR_DUP_NAME - ÐÑ Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ñ, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ ÑÐ°ÐºÐ¾Ðµ Ð¶Ðµ Ð¸Ð¼Ñ ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð² ÑÑÐ¾Ð¹ ÑÐµÑÐ¸. ÐÐ»Ñ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ðº Ð´Ð¾Ð¼ÐµÐ½Ñ Ð¾ÑÐºÑÐ¾Ð¹ÑÐµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð¿Ð°Ð½ÐµÐ»Ð¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ "Ð¡Ð¸ÑÑÐµÐ¼Ð°", Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÐµ Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ. ÐÐ»Ñ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ðº ÑÐ°Ð±Ð¾ÑÐµÐ¹ Ð³ÑÑÐ¿Ð¿Ðµ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð´ÑÑÐ³Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ°Ð±Ð¾ÑÐµÐ¹ Ð³ÑÑÐ¿Ð¿Ñ. +. MessageId=53 Severity=Success @@ -348,6 +473,9 @@ Language=English ERROR_BAD_NETPATH - The network path was not found. . +Language=Russian +ERROR_BAD_NETPATH - ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð¿ÑÑÑ. +. MessageId=54 Severity=Success @@ -356,6 +484,9 @@ Language=English ERROR_NETWORK_BUSY - The network is busy. . +Language=Russian +ERROR_NETWORK_BUSY - Ð¡ÐµÑÑ Ð·Ð°Ð½ÑÑÐ°. +. MessageId=55 Severity=Success @@ -364,6 +495,9 @@ Language=English ERROR_DEV_NOT_EXIST - The specified network resource or device is no longer available. . +Language=Russian +ERROR_DEV_NOT_EXIST - Ð¡ÐµÑÐµÐ²Ð¾Ð¹ ÑÐµÑÑÑÑ Ð¸Ð»Ð¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð±Ð¾Ð»ÐµÐµ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾. +. MessageId=56 Severity=Success @@ -372,6 +506,9 @@ Language=English ERROR_TOO_MANY_CMDS - The network BIOS command limit has been reached. . +Language=Russian +ERROR_TOO_MANY_CMDS - ÐÐ¾ÑÑÐ¸Ð³Ð½ÑÑ Ð¿ÑÐµÐ´ÐµÐ» ÑÐ¸ÑÐ»Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´ NetBIOS. +. MessageId=57 Severity=Success @@ -380,6 +517,9 @@ Language=English ERROR_ADAP_HDW_ERR - A network adapter hardware error occurred. . +Language=Russian +ERROR_ADAP_HDW_ERR - ÐÐ¿Ð¿Ð°ÑÐ°ÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ° ÑÐµÑÐµÐ²Ð¾Ð¹ Ð¿Ð»Ð°ÑÑ. +. MessageId=58 Severity=Success @@ -388,6 +528,9 @@ Language=English ERROR_BAD_NET_RESP - The specified server cannot perform the requested operation. . +Language=Russian +ERROR_BAD_NET_RESP - Ð£ÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÑÐµÑÐ²ÐµÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ ÑÑÐµÐ±ÑÐµÐ¼ÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ. +. MessageId=59 Severity=Success @@ -396,6 +539,9 @@ Language=English ERROR_UNEXP_NET_ERR - An unexpected network error occurred. . +Language=Russian +ERROR_UNEXP_NET_ERR - ÐÐµÐ¿ÑÐµÐ´Ð²Ð¸Ð´ÐµÐ½Ð½Ð°Ñ ÑÐµÑÐµÐ²Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°. +. MessageId=60 Severity=Success @@ -404,6 +550,9 @@ Language=English ERROR_BAD_REM_ADAP - The remote adapter is not compatible. . +Language=Russian +ERROR_BAD_REM_ADAP - ÐÐµÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼ÑÐ¹ ÑÐ´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ. +. MessageId=61 Severity=Success @@ -412,6 +561,9 @@ Language=English ERROR_PRINTQ_FULL - The printer queue is full. . +Language=Russian +ERROR_PRINTQ_FULL - ÐÑÐµÑÐµÐ´Ñ Ð¿ÐµÑÐ°ÑÐ¸ Ð¿ÐµÑÐµÐ¿Ð¾Ð»Ð½ÐµÐ½Ð°. +. MessageId=62 Severity=Success @@ -420,6 +572,9 @@ Language=English ERROR_NO_SPOOL_SPACE - Space to store the file waiting to be printed is not available on the server. . +Language=Russian +ERROR_NO_SPOOL_SPACE - ÐÐ° ÑÐµÑÐ²ÐµÑÐµ Ð½ÐµÑ Ð¼ÐµÑÑÐ° Ð´Ð»Ñ ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¾Ð¶Ð¸Ð´Ð°ÑÑÐµÐ³Ð¾ Ð¿ÐµÑÐ°ÑÐ¸ ÑÐ°Ð¹Ð»Ð°. +. MessageId=63 Severity=Success @@ -428,6 +583,9 @@ Language=English ERROR_PRINT_CANCELLED - Your file waiting to be printed was deleted. . +Language=Russian +ERROR_PRINT_CANCELLED - ÐÐ°Ñ ÑÐ°Ð¹Ð», Ð½Ð°ÑÐ¾Ð´Ð¸Ð²ÑÐ¸Ð¹ÑÑ Ð² Ð¾ÑÐµÑÐµÐ´Ð¸ Ð²ÑÐ²Ð¾Ð´Ð° Ð½Ð° Ð¿ÐµÑÐ°ÑÑ, Ð±ÑÐ» ÑÐ´Ð°Ð»ÐµÐ½. +. MessageId=64 Severity=Success @@ -436,6 +594,9 @@ Language=English ERROR_NETNAME_DELETED - The specified network name is no longer available. . +Language=Russian +ERROR_NETNAME_DELETED - Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ ÑÐµÑÐµÐ²Ð¾Ðµ Ð¸Ð¼Ñ Ð±Ð¾Ð»ÐµÐµ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾. +. MessageId=65 Severity=Success @@ -444,6 +605,9 @@ Language=English ERROR_NETWORK_ACCESS_DENIED - Network access is denied. . +Language=Russian +ERROR_NETWORK_ACCESS_DENIED - ÐÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÐµÑÐ¸. +. MessageId=66 Severity=Success @@ -452,6 +616,9 @@ Language=English ERROR_BAD_DEV_TYPE - The network resource type is not correct. . +Language=Russian +ERROR_BAD_DEV_TYPE - ÐÐµÐ²ÐµÑÐ½Ð¾ ÑÐºÐ°Ð·Ð°Ð½ ÑÐ¸Ð¿ ÑÐµÑÐµÐ²Ð¾Ð³Ð¾ ÑÐµÑÑÑÑÐ°. +. MessageId=67 Severity=Success @@ -460,6 +627,9 @@ Language=English ERROR_BAD_NET_NAME - The network name cannot be found. . +Language=Russian +ERROR_BAD_NET_NAME - ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐµÑÐµÐ²Ð¾Ðµ Ð¸Ð¼Ñ. +. MessageId=68 Severity=Success @@ -468,6 +638,9 @@ Language=English ERROR_TOO_MANY_NAMES - The name limit for the local computer network adapter card was exceeded. . +Language=Russian +ERROR_TOO_MANY_NAMES - ÐÑÐµÐ²ÑÑÐµÐ½ Ð¿ÑÐµÐ´ÐµÐ» ÑÐ¸ÑÐ»Ð° Ð¸Ð¼ÐµÐ½ Ð´Ð»Ñ ÑÐµÑÐµÐ²Ð¾Ð³Ð¾ Ð°Ð´Ð°Ð¿ÑÐµÑÐ° Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°. +. MessageId=69 Severity=Success @@ -476,6 +649,9 @@ Language=English ERROR_TOO_MANY_SESS - The network BIOS session limit was exceeded. . +Language=Russian +ERROR_TOO_MANY_SESS - ÐÑÐµÐ²ÑÑÐµÐ½ Ð¿ÑÐµÐ´ÐµÐ» Ð¿Ð¾ ÑÐ¸ÑÐ»Ñ ÑÐµÐ°Ð½ÑÐ¾Ð² NetBIOS. +. MessageId=70 Severity=Success @@ -484,6 +660,9 @@ Language=English ERROR_SHARING_PAUSED - The remote server has been paused or is in the process of being started. . +Language=Russian +ERROR_SHARING_PAUSED - Ð¡ÐµÑÐ²ÐµÑ ÑÐµÑÐ¸ Ð±ÑÐ» Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸Ð»Ð¸ Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð² Ð¿ÑÐ¾ÑÐµÑÑÐµ Ð·Ð°Ð¿ÑÑÐºÐ°. +. MessageId=71 Severity=Success @@ -492,6 +671,9 @@ Language=English ERROR_REQ_NOT_ACCEP - No more connections can be made to this remote computer at this time because there are already as many connections as the computer can accept. . +Language=Russian +ERROR_REQ_NOT_ACCEP - ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ðº ÑÑÐ¾Ð¼Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÑ ÑÐµÐ¹ÑÐ°Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ, ÑÐ°Ðº ÐºÐ°Ðº Ð¸Ñ ÑÐ¸ÑÐ»Ð¾ Ð´Ð¾ÑÑÐ¸Ð³Ð»Ð¾ Ð¿ÑÐµÐ´ÐµÐ»Ð°. +. MessageId=72 Severity=Success @@ -500,6 +682,9 @@ Language=English ERROR_REDIR_PAUSED - The specified printer or disk device has been paused. . +Language=Russian +ERROR_REDIR_PAUSED - Ð Ð°Ð±Ð¾ÑÐ° ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¸Ð½ÑÐµÑÐ° Ð¸Ð»Ð¸ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð½Ð°ÐºÐ¾Ð¿Ð¸ÑÐµÐ»Ñ Ð±ÑÐ»Ð° Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð°. +. MessageId=80 Severity=Success @@ -508,6 +693,9 @@ Language=English ERROR_FILE_EXISTS - The file exists. . +Language=Russian +ERROR_FILE_EXISTS - Ð¤Ð°Ð¹Ð» ÑÑÑÐµÑÑÐ²ÑÐµÑ. +. MessageId=82 Severity=Success @@ -516,6 +704,9 @@ Language=English ERROR_CANNOT_MAKE - The directory or file cannot be created. . +Language=Russian +ERROR_CANNOT_MAKE - ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ°Ð¹Ð» Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÑ. +. MessageId=83 Severity=Success @@ -524,6 +715,9 @@ Language=English ERROR_FAIL_I24 - Fail on INT 24. . +Language=Russian +ERROR_FAIL_I24 - Ð¡Ð±Ð¾Ð¹ Ð¿ÑÐµÑÑÐ²Ð°Ð½Ð¸Ñ INT 24. +. MessageId=84 Severity=Success @@ -532,6 +726,9 @@ Language=English ERROR_OUT_OF_STRUCTURES - Storage to process this request is not available. . +Language=Russian +ERROR_OUT_OF_STRUCTURES - ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸ Ð´Ð»Ñ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ Ð·Ð°Ð¿ÑÐ¾ÑÐ°. +. MessageId=85 Severity=Success @@ -540,6 +737,9 @@ Language=English ERROR_ALREADY_ASSIGNED - The local device name is already in use. . +Language=Russian +ERROR_ALREADY_ASSIGNED - ÐÐ¼Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° ÑÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ. +. MessageId=86 Severity=Success @@ -548,6 +748,9 @@ Language=English ERROR_INVALID_PASSWORD - The specified network password is not correct. . +Language=Russian +ERROR_INVALID_PASSWORD - Ð¡ÐµÑÐµÐ²Ð¾Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ ÑÐºÐ°Ð·Ð°Ð½ Ð½ÐµÐ²ÐµÑÐ½Ð¾. +. MessageId=87 Severity=Success @@ -556,6 +759,9 @@ Language=English ERROR_INVALID_PARAMETER - The parameter is incorrect. . +Language=Russian +ERROR_INVALID_PARAMETER - ÐÐ°ÑÐ°Ð¼ÐµÑÑ Ð·Ð°Ð´Ð°Ð½ Ð½ÐµÐ²ÐµÑÐ½Ð¾. +. MessageId=88 Severity=Success @@ -564,6 +770,9 @@ Language=English ERROR_NET_WRITE_FAULT - A write fault occurred on the network. . +Language=Russian +ERROR_NET_WRITE_FAULT - ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð² ÑÐµÑÐ¸. +. MessageId=89 Severity=Success @@ -572,6 +781,9 @@ Language=English ERROR_NO_PROC_SLOTS - The system cannot start another process at this time. . +Language=Russian +ERROR_NO_PROC_SLOTS - Ð Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ ÑÐ¸ÑÑÐµÐ¼Ðµ Ð½Ðµ ÑÐ´Ð°ÐµÑÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Ð´ÑÑÐ³Ð¾Ð¹ Ð¿ÑÐ¾ÑÐµÑÑ. +. MessageId=100 Severity=Success @@ -580,6 +792,9 @@ Language=English ERROR_TOO_MANY_SEMAPHORES - Cannot create another system semaphore. . +Language=Russian +ERROR_TOO_MANY_SEMAPHORES - ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÐµÑÐµ Ð¾Ð´Ð¸Ð½ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐ¹ ÑÐµÐ¼Ð°ÑÐ¾Ñ. +. MessageId=101 Severity=Success @@ -588,6 +803,9 @@ Language=English ERROR_EXCL_SEM_ALREADY_OWNED - The exclusive semaphore is owned by another process. . +Language=Russian +ERROR_EXCL_SEM_ALREADY_OWNED - Ð¡ÐµÐ¼Ð°ÑÐ¾Ñ ÑÐºÑÐºÐ»ÑÐ·Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð° Ð·Ð°Ð½ÑÑ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ð¼. +. MessageId=102 Severity=Success @@ -596,6 +814,9 @@ Language=English ERROR_SEM_IS_SET - The semaphore is set and cannot be closed. . +Language=Russian +ERROR_SEM_IS_SET - Ð¡ÐµÐ¼Ð°ÑÐ¾Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°ÐºÑÑÑ. +. MessageId=103 Severity=Success @@ -604,6 +825,9 @@ Language=English ERROR_TOO_MANY_SEM_REQUESTS - The semaphore cannot be set again. . +Language=Russian +ERROR_TOO_MANY_SEM_REQUESTS - Ð¡ÐµÐ¼Ð°ÑÐ¾Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¿Ð¾Ð²ÑÐ¾ÑÐ½Ð¾. +. MessageId=104 Severity=Success @@ -612,6 +836,9 @@ Language=English ERROR_INVALID_AT_INTERRUPT_TIME - Cannot request exclusive semaphores at interrupt time. . +Language=Russian +ERROR_INVALID_AT_INTERRUPT_TIME - ÐÐ°Ð¿ÑÐ¾ÑÑ Ðº ÑÐµÐ¼Ð°ÑÐ¾ÑÐ°Ð¼ ÑÐºÑÐºÐ»ÑÐ·Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð° Ð½Ð° Ð²ÑÐµÐ¼Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿ÑÐµÑÑÐ²Ð°Ð½Ð¸Ð¹ Ð½Ðµ Ð´Ð¾Ð¿ÑÑÐºÐ°ÑÑÑÑ. +. MessageId=105 Severity=Success @@ -620,6 +847,9 @@ Language=English ERROR_SEM_OWNER_DIED - The previous ownership of this semaphore has ended. . +Language=Russian +ERROR_SEM_OWNER_DIED - ÐÑÐ¾Ñ ÑÐµÐ¼Ð°ÑÐ¾Ñ Ð±Ð¾Ð»ÐµÐµ Ð½Ðµ Ð¿ÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð²ÑÐµÐ¼Ñ ÐµÐ³Ð¾ Ð¿ÑÐ¾ÑÐµÑÑÑ. +. MessageId=106 Severity=Success @@ -628,6 +858,9 @@ Language=English ERROR_SEM_USER_LIMIT - Insert the diskette for drive %1. . +Language=Russian +ERROR_SEM_USER_LIMIT - ÐÑÑÐ°Ð²ÑÐµ Ð´Ð¸ÑÐºÐµÑÑ Ð² Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ %1. +. MessageId=107 Severity=Success @@ -636,6 +869,9 @@ Language=English ERROR_DISK_CHANGE - The program stopped because an alternate diskette was not inserted. . +Language=Russian +ERROR_DISK_CHANGE - ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð±ÑÐ»Ð° Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð°, ÑÐ°Ðº ÐºÐ°Ðº Ð½ÑÐ¶Ð½ÑÐ¹ Ð´Ð¸ÑÐº Ð²ÑÑÐ°Ð²Ð»ÐµÐ½ Ð½Ðµ Ð±ÑÐ». +. MessageId=108 Severity=Success @@ -644,6 +880,9 @@ Language=English ERROR_DRIVE_LOCKED - The disk is in use or locked by another process. . +Language=Russian +ERROR_DRIVE_LOCKED - ÐÐ¸ÑÐº Ð·Ð°Ð½ÑÑ Ð¸Ð»Ð¸ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ð¼. +. MessageId=109 Severity=Success @@ -652,6 +891,9 @@ Language=English ERROR_BROKEN_PIPE - The pipe has been ended. . +Language=Russian +ERROR_BROKEN_PIPE - ÐÐ°Ð½Ð°Ð» Ð±ÑÐ» Ð·Ð°ÐºÑÑÑ. +. MessageId=110 Severity=Success @@ -660,6 +902,9 @@ Language=English ERROR_OPEN_FAILED - The system cannot open the device or file specified. . +Language=Russian +ERROR_OPEN_FAILED - Ð¡Ð¸ÑÑÐµÐ¼Ðµ Ð½Ðµ ÑÐ´Ð°ÐµÑÑÑ Ð¾ÑÐºÑÑÑÑ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð¸Ð»Ð¸ ÑÐ°Ð¹Ð». +. MessageId=111 Severity=Success @@ -668,6 +913,9 @@ Language=English ERROR_BUFFER_OVERFLOW - The file name is too long. . +Language=Russian +ERROR_BUFFER_OVERFLOW - Ð£ÐºÐ°Ð·Ð°Ð½Ð¾ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð°. +. MessageId=112 Severity=Success @@ -676,6 +924,9 @@ Language=English ERROR_DISK_FULL - There is not enough space on the disk. . +Language=Russian +ERROR_DISK_FULL - ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¼ÐµÑÑÐ° Ð½Ð° Ð´Ð¸ÑÐºÐµ. +. MessageId=113 Severity=Success @@ -684,6 +935,9 @@ Language=English ERROR_NO_MORE_SEARCH_HANDLES - No more internal file identifiers available. . +Language=Russian +ERROR_NO_MORE_SEARCH_HANDLES - ÐÑÑÐµÑÐ¿Ð°Ð½Ñ Ð²Ð½ÑÑÑÐµÐ½Ð½Ð¸Ðµ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð². +. MessageId=114 Severity=Success @@ -692,6 +946,9 @@ Language=English ERROR_INVALID_TARGET_HANDLE - The target internal file identifier is incorrect. . +Language=Russian +ERROR_INVALID_TARGET_HANDLE - Ð ÐµÐ·ÑÐ»ÑÑÐ¸ÑÑÑÑÐ¸Ð¹ Ð²Ð½ÑÑÑÐµÐ½Ð½Ð¸Ð¹ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ ÑÐ°Ð¹Ð»Ð° Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½. +. MessageId=117 Severity=Success @@ -700,6 +957,9 @@ Language=English ERROR_INVALID_CATEGORY - The IOCTL call made by the application program is not correct. . +Language=Russian +ERROR_INVALID_CATEGORY - ÐÑÐ·Ð¾Ð² IOCTL Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼ Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½ Ð½ÐµÐ²ÐµÑÐ½Ð¾. +. MessageId=118 Severity=Success @@ -708,6 +968,9 @@ Language=English ERROR_INVALID_VERIFY_SWITCH - The verify-on-write switch parameter value is not correct. . +Language=Russian +ERROR_INVALID_VERIFY_SWITCH - ÐÐ°ÑÐ°Ð¼ÐµÑÑ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð´Ð°Ð½Ð½ÑÑ Ð¸Ð¼ÐµÐµÑ Ð½ÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ. +. MessageId=119 Severity=Success @@ -716,6 +979,9 @@ Language=English ERROR_BAD_DRIVER_LEVEL - The system does not support the command requested. . +Language=Russian +ERROR_BAD_DRIVER_LEVEL - Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ. +. MessageId=120 Severity=Success @@ -724,6 +990,9 @@ Language=English ERROR_CALL_NOT_IMPLEMENTED - This function is not supported on this system. . +Language=Russian +ERROR_CALL_NOT_IMPLEMENTED - ÐÑÐ° ÑÑÐ½ÐºÑÐ¸Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð´Ð»Ñ ÑÑÐ¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ. +. MessageId=121 Severity=Success @@ -732,6 +1001,9 @@ Language=English ERROR_SEM_TIMEOUT - The semaphore timeout period has expired. . +Language=Russian +ERROR_SEM_TIMEOUT - ÐÑÐµÐ²ÑÑÐµÐ½ ÑÐ°Ð¹Ð¼Ð°ÑÑ ÑÐµÐ¼Ð°ÑÐ¾ÑÐ°. +. MessageId=122 Severity=Success @@ -740,6 +1012,9 @@ Language=English ERROR_INSUFFICIENT_BUFFER - The data area passed to a system call is too small. . +Language=Russian +ERROR_INSUFFICIENT_BUFFER - ÐÐ±Ð»Ð°ÑÑÑ Ð´Ð°Ð½Ð½ÑÑ, Ð¿ÐµÑÐµÐ´Ð°Ð½Ð½Ð°Ñ Ð¿Ð¾ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ð¼Ñ Ð²ÑÐ·Ð¾Ð²Ñ, ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð¼Ð°Ð»Ð°. +. MessageId=123 Severity=Success @@ -748,6 +1023,9 @@ Language=English ERROR_INVALID_NAME - The filename, directory name, or volume label syntax is incorrect. . +Language=Russian +ERROR_INVALID_NAME - Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸ÑÐµÑÐºÐ°Ñ Ð¾ÑÐ¸Ð±ÐºÐ° Ð² Ð¸Ð¼ÐµÐ½Ð¸ ÑÐ°Ð¹Ð»Ð°, Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð°Ð¿ÐºÐ¸ Ð¸Ð»Ð¸ Ð¼ÐµÑÐºÐµ ÑÐ¾Ð¼Ð°. +. MessageId=124 Severity=Success @@ -756,6 +1034,9 @@ Language=English ERROR_INVALID_LEVEL - The system call level is not correct. . +Language=Russian +ERROR_INVALID_LEVEL - ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÑÐ¾Ð²ÐµÐ½Ñ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð²ÑÐ·Ð¾Ð²Ð°. +. MessageId=125 Severity=Success @@ -764,6 +1045,9 @@ Language=English ERROR_NO_VOLUME_LABEL - The disk has no volume label. . +Language=Russian +ERROR_NO_VOLUME_LABEL - Ð£ Ð´Ð¸ÑÐºÐ° Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ Ð¼ÐµÑÐºÐ° ÑÐ¾Ð¼Ð°. +. MessageId=126 Severity=Success @@ -772,6 +1056,9 @@ Language=English ERROR_MOD_NOT_FOUND - The specified module could not be found. . +Language=Russian +ERROR_MOD_NOT_FOUND - ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð´ÑÐ»Ñ. +. MessageId=127 Severity=Success @@ -780,6 +1067,9 @@ Language=English ERROR_PROC_NOT_FOUND - The specified procedure could not be found. . +Language=Russian +ERROR_PROC_NOT_FOUND - ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð° ÑÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ Ð¿ÑÐ¾ÑÐµÐ´ÑÑÐ°. +. MessageId=128 Severity=Success @@ -788,6 +1078,9 @@ Language=English ERROR_WAIT_NO_CHILDREN - There are no child processes to wait for. . +Language=Russian +ERROR_WAIT_NO_CHILDREN - ÐÐ¾ÑÐµÑÐ½Ð¸Ðµ Ð¿ÑÐ¾ÑÐµÑÑÑ, Ð¾ÐºÐ¾Ð½ÑÐ°Ð½Ð¸Ñ ÐºÐ¾ÑÐ¾ÑÑÑ ÑÑÐµÐ±ÑÐµÑÑÑ Ð¾Ð¶Ð¸Ð´Ð°ÑÑ, Ð¾ÑÑÑÑÑÑÐ²ÑÑÑ. +. MessageId=129 Severity=Success @@ -796,6 +1089,9 @@ Language=English ERROR_CHILD_NOT_COMPLETE - The %1 application cannot be run in Win32 mode. . +Language=Russian +ERROR_CHILD_NOT_COMPLETE - ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ "%1" Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð¿ÑÑÐµÐ½Ð¾ Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ Win32. +. MessageId=130 Severity=Success @@ -804,6 +1100,9 @@ Language=English ERROR_DIRECT_ACCESS_HANDLE - Attempt to use a file handle to an open disk partition for an operation other than raw disk I/O. . +Language=Russian +ERROR_DIRECT_ACCESS_HANDLE - ÐÐ¾Ð¿ÑÑÐºÐ° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð´ÐµÑÐºÑÐ¸Ð¿ÑÐ¾Ñ ÑÐ°Ð¹Ð»Ð° Ð´Ð»Ñ Ð¾ÑÐºÑÑÑÐ¸Ñ ÑÐ°Ð·Ð´ÐµÐ»Ð° Ð´Ð¸ÑÐºÐ° Ð¸ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸, Ð¾ÑÐ»Ð¸ÑÐ°ÑÑÐµÐ¹ÑÑ Ð¾Ñ Ð²Ð²Ð¾Ð´Ð°/Ð²ÑÐ²Ð¾Ð´Ð° Ð½Ð¸Ð¶Ð½ÐµÐ³Ð¾ ÑÑÐ¾Ð²Ð½Ñ. +. MessageId=131 Severity=Success @@ -812,6 +1111,9 @@ Language=English ERROR_NEGATIVE_SEEK - An attempt was made to move the file pointer before the beginning of the file. . +Language=Russian +ERROR_NEGATIVE_SEEK - ÐÐ¾Ð¿ÑÑÐºÐ° Ð¿Ð¾Ð¼ÐµÑÑÐ¸ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð½Ð° ÑÐ°Ð¹Ð» Ð¿ÐµÑÐµÐ´ Ð½Ð°ÑÐ°Ð»Ð¾Ð¼ ÑÐ°Ð¹Ð»Ð°. +. MessageId=132 Severity=Success @@ -820,6 +1122,9 @@ Language=English ERROR_SEEK_ON_DEVICE - The file pointer cannot be set on the specified device or file. . +Language=Russian +ERROR_SEEK_ON_DEVICE - Ð£ÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð½Ð° ÑÐ°Ð¹Ð» Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð½Ð° Ð·Ð°Ð´Ð°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð¸Ð»Ð¸ ÑÐ°Ð¹Ð». +. MessageId=133 Severity=Success @@ -828,6 +1133,9 @@ Language=English ERROR_IS_JOIN_TARGET - A JOIN or SUBST command cannot be used for a drive that contains previously joined drives. . +Language=Russian +ERROR_IS_JOIN_TARGET - ÐÐ¾Ð¼Ð°Ð½Ð´Ñ JOIN Ð¸ SUBST Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ñ Ð´Ð»Ñ Ð´Ð¸ÑÐºÐ¾Ð², ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÐ¸Ñ ÑÐ¶Ðµ Ð¾Ð±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð¸ÑÐºÐ¸. +. MessageId=134 Severity=Success @@ -836,6 +1144,9 @@ Language=English ERROR_IS_JOINED - An attempt was made to use a JOIN or SUBST command on a drive that has already been joined. . +Language=Russian +ERROR_IS_JOINED - ÐÐ¾Ð¿ÑÑÐºÐ° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ JOIN Ð¸Ð»Ð¸ SUBST Ð´Ð»Ñ Ð´Ð¸ÑÐºÐ°, ÑÐ¶Ðµ Ð²ÐºÐ»ÑÑÐµÐ½Ð½Ð¾Ð³Ð¾ Ð² Ð½Ð°Ð±Ð¾Ñ Ð¾Ð±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð½ÑÑ Ð´Ð¸ÑÐºÐ¾Ð². +. MessageId=135 Severity=Success @@ -844,6 +1155,9 @@ Language=English ERROR_IS_SUBSTED - An attempt was made to use a JOIN or SUBST command on a drive that has already been substituted. . +Language=Russian +ERROR_IS_SUBSTED - ÐÐ¾Ð¿ÑÑÐºÐ° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ JOIN Ð¸Ð»Ð¸ SUBST Ð´Ð»Ñ Ð´Ð¸ÑÐºÐ°, ÐºÐ¾ÑÐ¾ÑÑÐ¹ ÑÐ¶Ðµ Ð±ÑÐ» Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½. +. MessageId=136 Severity=Success @@ -852,6 +1166,9 @@ Language=English ERROR_NOT_JOINED - The system tried to delete the JOIN of a drive that is not joined. . +Language=Russian +ERROR_NOT_JOINED - ÐÐ¾Ð¿ÑÑÐºÐ° ÑÐ½ÑÑÑ Ð¿ÑÐ¸Ð·Ð½Ð°Ðº Ð¾Ð±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ Ð´Ð¸ÑÐºÐ°, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÐ¾Ð³Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° JOIN Ð½Ðµ Ð²ÑÐ¿Ð¾Ð»Ð½ÑÐ»Ð°ÑÑ. +. MessageId=137 Severity=Success @@ -860,6 +1177,9 @@ Language=English ERROR_NOT_SUBSTED - The system tried to delete the substitution of a drive that is not substituted. . +Language=Russian +ERROR_NOT_SUBSTED - ÐÐ¾Ð¿ÑÑÐºÐ° ÑÐ½ÑÑÑ Ð¿ÑÐ¸Ð·Ð½Ð°Ðº Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ñ Ð´Ð¸ÑÐºÐ°, Ð´Ð»Ñ ÐºÐ¾ÑÐ¾ÑÐ¾Ð³Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° SUBST Ð½Ðµ Ð²ÑÐ¿Ð¾Ð»Ð½ÑÐ»Ð°ÑÑ. +. MessageId=138 Severity=Success @@ -868,6 +1188,9 @@ Language=English ERROR_JOIN_TO_JOIN - The system tried to join a drive to a directory on a joined drive. . +Language=Russian +ERROR_JOIN_TO_JOIN - ÐÐ¾Ð¿ÑÑÐºÐ° Ð¾Ð±ÑÐµÐ´Ð¸Ð½Ð¸ÑÑ Ð´Ð¸ÑÐº Ñ Ð¿Ð°Ð¿ÐºÐ¾Ð¹ Ð½Ð° Ð¾Ð±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ. +. MessageId=139 Severity=Success @@ -876,6 +1199,9 @@ Language=English ERROR_SUBST_TO_SUBST - The system tried to substitute a drive to a directory on a substituted drive. . +Language=Russian +ERROR_SUBST_TO_SUBST - ÐÐ¾Ð¿ÑÑÐºÐ° Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð´Ð¸ÑÐº Ð½Ð° Ð¿Ð°Ð¿ÐºÑ, Ð½Ð°ÑÐ¾Ð´ÑÑÑÑÑÑ Ð½Ð° Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ. +. MessageId=140 Severity=Success @@ -884,6 +1210,9 @@ Language=English ERROR_JOIN_TO_SUBST - The system tried to join a drive to a directory on a substituted drive. . +Language=Russian +ERROR_JOIN_TO_SUBST - ÐÐ¾Ð¿ÑÑÐºÐ° Ð¾Ð±ÑÐµÐ´Ð¸Ð½Ð¸ÑÑ Ð´Ð¸ÑÐº Ñ Ð¿Ð°Ð¿ÐºÐ¾Ð¹ Ð½Ð° Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ. +. MessageId=141 Severity=Success @@ -892,6 +1221,9 @@ Language=English ERROR_SUBST_TO_JOIN - The system tried to SUBST a drive to a directory on a joined drive. . +Language=Russian +ERROR_SUBST_TO_JOIN - ÐÐ¾Ð¿ÑÑÐºÐ° Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð´Ð¸ÑÐº Ð½Ð° Ð¿Ð°Ð¿ÐºÑ, Ð½Ð°ÑÐ¾Ð´ÑÑÑÑÑÑ Ð½Ð° Ð¾Ð±ÑÐµÐ´Ð¸Ð½ÐµÐ½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ. +. MessageId=142 Severity=Success @@ -900,6 +1232,9 @@ Language=English ERROR_BUSY_DRIVE - The system cannot perform a JOIN or SUBST at this time. . +Language=Russian +ERROR_BUSY_DRIVE - Ð Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ JOIN Ð¸Ð»Ð¸ SUBST Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾. +. MessageId=143 Severity=Success @@ -908,6 +1243,9 @@ Language=English ERROR_SAME_DRIVE - The system cannot join or substitute a drive to or for a directory on the same drive. . +Language=Russian +ERROR_SAME_DRIVE - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±ÑÐµÐ´Ð¸Ð½Ð¸ÑÑ (Ð¸Ð»Ð¸ Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ) Ð´Ð¸ÑÐº Ñ Ð¿Ð°Ð¿ÐºÐ¾Ð¹ (Ð¸Ð»Ð¸ Ð½Ð° Ð¿Ð°Ð¿ÐºÑ) ÑÑÐ¾Ð³Ð¾ Ð¶Ðµ Ð´Ð¸ÑÐºÐ°. +. MessageId=144 Severity=Success @@ -916,6 +1254,9 @@ Language=English ERROR_DIR_NOT_ROOT - The directory is not a subdirectory of the root directory. . +Language=Russian +ERROR_DIR_NOT_ROOT - ÐÑÐ° Ð¿Ð°Ð¿ÐºÐ° Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ¾Ð¹ ÐºÐ¾ÑÐ½ÐµÐ²Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸. +. MessageId=145 Severity=Success @@ -924,6 +1265,9 @@ Language=English ERROR_DIR_NOT_EMPTY - The directory is not empty. . +Language=Russian +ERROR_DIR_NOT_EMPTY - ÐÐ°Ð¿ÐºÐ° Ð½Ðµ Ð¿ÑÑÑÐ°. +. MessageId=146 Severity=Success @@ -932,6 +1276,9 @@ Language=English ERROR_IS_SUBST_PATH - The path specified is being used in a substitute. . +Language=Russian +ERROR_IS_SUBST_PATH - Ð£ÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð¿ÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°. +. MessageId=147 Severity=Success @@ -940,6 +1287,9 @@ Language=English ERROR_IS_JOIN_PATH - Not enough resources are available to process this command. . +Language=Russian +ERROR_IS_JOIN_PATH - ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ ÑÐµÑÑÑÑÐ¾Ð² Ð´Ð»Ñ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ. +. MessageId=148 Severity=Success @@ -948,6 +1298,9 @@ Language=English ERROR_PATH_BUSY - The path specified cannot be used at this time. . +Language=Russian +ERROR_PATH_BUSY - Ð£ÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð¿ÑÑÑ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐµÐ¹ÑÐ°Ñ. +. MessageId=149 Severity=Success @@ -956,6 +1309,9 @@ Language=English ERROR_IS_SUBST_TARGET - An attempt was made to join or substitute a drive for which a directory on the drive is the target of a previous substitute. . +Language=Russian +ERROR_IS_SUBST_TARGET - ÐÐ¾Ð¿ÑÑÐºÐ° Ð¾Ð±ÑÐµÐ´Ð¸Ð½Ð¸ÑÑ Ð¸Ð»Ð¸ Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð´Ð¸ÑÐº, Ð¿Ð°Ð¿ÐºÐ° Ð½Ð° ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼ ÑÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ. +. MessageId=150 Severity=Success @@ -964,6 +1320,9 @@ Language=English ERROR_SYSTEM_TRACE - System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed. . +Language=Russian +ERROR_SYSTEM_TRACE - Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ÑÑÐ°ÑÑÐ¸ÑÐ¾Ð²ÐºÐµ Ð² ÑÐ°Ð¹Ð»Ðµ CONFIG.SYS Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ, Ð»Ð¸Ð±Ð¾ ÑÑÐ°ÑÑÐ¸ÑÐ¾Ð²ÐºÐ° Ð·Ð°Ð¿ÑÐµÑÐµÐ½Ð°. +. MessageId=151 Severity=Success @@ -972,6 +1331,9 @@ Language=English ERROR_INVALID_EVENT_COUNT - The number of specified semaphore events for DosMuxSemWait is not correct. . +Language=Russian +ERROR_INVALID_EVENT_COUNT - Ð§Ð¸ÑÐ»Ð¾ ÑÐµÐ¼Ð°ÑÐ¾ÑÐ¾Ð² Ð´Ð»Ñ DosMuxSemWait Ð·Ð°Ð´Ð°Ð½Ð¾ Ð½ÐµÐ²ÐµÑÐ½Ð¾. +. MessageId=152 Severity=Success @@ -980,6 +1342,9 @@ Language=English ERROR_TOO_MANY_MUXWAITERS - DosMuxSemWait did not execute; too many semaphores are already set. . +Language=Russian +ERROR_TOO_MANY_MUXWAITERS - ÐÐµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½ Ð²ÑÐ·Ð¾Ð² DosMuxSemWait. Ð£ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð¼Ð½Ð¾Ð³Ð¾ ÑÐµÐ¼Ð°ÑÐ¾ÑÐ¾Ð². +. MessageId=153 Severity=Success @@ -988,6 +1353,9 @@ Language=English ERROR_INVALID_LIST_FORMAT - The DosMuxSemWait list is not correct. . +Language=Russian +ERROR_INVALID_LIST_FORMAT - ÐÐµÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¹ Ð²ÑÐ·Ð¾Ð² DosMuxSemWait. +. MessageId=154 Severity=Success @@ -996,6 +1364,9 @@ Language=English ERROR_LABEL_TOO_LONG - The volume label you entered exceeds the label character limit of the target file system. . +Language=Russian +ERROR_LABEL_TOO_LONG - ÐÐ»Ð¸Ð½Ð° Ð¼ÐµÑÐºÐ¸ ÑÐ¾Ð¼Ð° Ð¿ÑÐµÐ²Ð¾ÑÑÐ¾Ð´Ð¸Ñ Ð¿ÑÐµÐ´ÐµÐ», ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÐ¹ Ð´Ð»Ñ ÑÐ°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ. +. MessageId=155 Severity=Success @@ -1004,6 +1375,9 @@ Language=English ERROR_TOO_MANY_TCBS - Cannot create another thread. . +Language=Russian +ERROR_TOO_MANY_TCBS - ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÐµÑÐµ Ð¾Ð´Ð¸Ð½ Ð¿Ð¾ÑÐ¾Ðº ÐºÐ¾Ð¼Ð°Ð½Ð´. +. MessageId=156 Severity=Success @@ -1012,6 +1386,9 @@ Language=English ERROR_SIGNAL_REFUSED - The recipient process has refused the signal. . +Language=Russian +ERROR_SIGNAL_REFUSED - ÐÑÐ¸Ð½Ð¸Ð¼Ð°ÑÑÐ¸Ð¹ Ð¿ÑÐ¾ÑÐµÑÑ Ð¾ÑÐºÐ»Ð¾Ð½Ð¸Ð» ÑÐ¸Ð³Ð½Ð°Ð». +. MessageId=157 Severity=Success @@ -1020,6 +1397,9 @@ Language=English ERROR_DISCARDED - The segment is already discarded and cannot be locked. . +Language=Russian +ERROR_DISCARDED - Ð¡ÐµÐ³Ð¼ÐµÐ½Ñ ÑÐ¶Ðµ Ð¾ÑÐ²Ð¾Ð±Ð¾Ð¶Ð´ÐµÐ½ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½. +. MessageId=158 Severity=Success @@ -1028,6 +1408,9 @@ Language=English ERROR_NOT_LOCKED - The segment is already unlocked. . +Language=Russian +ERROR_NOT_LOCKED - ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ° Ñ ÑÐµÐ³Ð¼ÐµÐ½ÑÐ° ÑÐ¶Ðµ ÑÐ½ÑÑÐ°. +. MessageId=159 Severity=Success @@ -1036,6 +1419,9 @@ Language=English ERROR_BAD_THREADID_ADDR - The address for the thread ID is not correct. . +Language=Russian +ERROR_BAD_THREADID_ADDR - ÐÐ´ÑÐµÑ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ° Ð¿Ð¾ÑÐ¾ÐºÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð·Ð°Ð´Ð°Ð½ Ð½ÐµÐ²ÐµÑÐ½Ð¾. +. MessageId=160 Severity=Success @@ -1044,6 +1430,9 @@ Language=English ERROR_BAD_ARGUMENTS - The argument string passed to DosExecPgm is not correct. . +Language=Russian +ERROR_BAD_ARGUMENTS - ÐÐµÐ²ÐµÑÐ½Ñ Ð¾Ð´Ð¸Ð½ Ð¸Ð»Ð¸ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð². +. MessageId=161 Severity=Success @@ -1052,6 +1441,9 @@ Language=English ERROR_BAD_PATHNAME - The specified path is invalid. . +Language=Russian +ERROR_BAD_PATHNAME - Ð£ÐºÐ°Ð·Ð°Ð½ Ð½ÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð¿ÑÑÑ. +. MessageId=162 Severity=Success @@ -1060,6 +1452,9 @@ Language=English ERROR_SIGNAL_PENDING - A signal is already pending. . +Language=Russian +ERROR_SIGNAL_PENDING - Ð¡Ð¸Ð³Ð½Ð°Ð» ÑÐ¶Ðµ Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð² ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ð¸ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸. +. MessageId=164 Severity=Success @@ -1068,6 +1463,9 @@ Language=English ERROR_MAX_THRDS_REACHED - No more threads can be created in the system. . +Language=Russian +ERROR_MAX_THRDS_REACHED - Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ Ð¿Ð¾ÑÐ¾ÐºÐ¾Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾. +. MessageId=167 Severity=Success @@ -1076,6 +1474,9 @@ Language=English ERROR_LOCK_FAILED - Unable to lock a region of a file. . +Language=Russian +ERROR_LOCK_FAILED - ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÐ½ÑÑÑ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÑ Ñ Ð¾Ð±Ð»Ð°ÑÑÐ¸ ÑÐ°Ð¹Ð»Ð°. +. MessageId=170 Severity=Success @@ -1084,6 +1485,9 @@ Language=English ERROR_BUSY - The requested resource is in use. . +Language=Russian +ERROR_BUSY - Ð¢ÑÐµÐ±ÑÐµÐ¼ÑÐ¹ ÑÐµÑÑÑÑ Ð·Ð°Ð½ÑÑ. +. MessageId=173 Severity=Success @@ -1092,6 +1496,9 @@ Language=English ERROR_CANCEL_VIOLATION - A lock request was not outstanding for the supplied cancel region. . +Language=Russian +ERROR_CANCEL_VIOLATION - ÐÐ°Ð¿ÑÐ¾Ñ Ð½Ð° Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÑ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²ÑÐµÑ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð¹ Ð¾Ð±Ð»Ð°ÑÑÐ¸. +. MessageId=174 Severity=Success @@ -1100,6 +1507,9 @@ Language=English ERROR_ATOMIC_LOCKS_NOT_SUPPORTED - The file system does not support atomic changes to the lock type. . +Language=Russian +ERROR_ATOMIC_LOCKS_NOT_SUPPORTED - Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑÐ¸Ð¿Ð° Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸. +. MessageId=180 Severity=Success @@ -1108,6 +1518,9 @@ Language=English ERROR_INVALID_SEGMENT_NUMBER - The system detected a segment number that was not correct. . +Language=Russian +ERROR_INVALID_SEGMENT_NUMBER - Ð¡Ð¸ÑÑÐµÐ¼Ð° Ð¾Ð±Ð½Ð°ÑÑÐ¶Ð¸Ð»Ð° Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐµÐ³Ð¼ÐµÐ½ÑÐ°. +. MessageId=182 Severity=Success @@ -1116,6 +1529,9 @@ Language=English ERROR_INVALID_ORDINAL - The operating system cannot run %1. . +Language=Russian +ERROR_INVALID_ORDINAL - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=183 Severity=Success @@ -1124,6 +1540,9 @@ Language=English ERROR_ALREADY_EXISTS - Cannot create a file when that file already exists. . +Language=Russian +ERROR_ALREADY_EXISTS - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ°Ð¹Ð», ÑÐ°Ðº ÐºÐ°Ðº Ð¾Ð½ ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ. +. MessageId=186 Severity=Success @@ -1132,6 +1551,9 @@ Language=English ERROR_INVALID_FLAG_NUMBER - The flag passed is not correct. . +Language=Russian +ERROR_INVALID_FLAG_NUMBER - ÐÐµÑÐµÐ´Ð°Ð½ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ»Ð°Ð³. +. MessageId=187 Severity=Success @@ -1140,6 +1562,9 @@ Language=English ERROR_SEM_NOT_FOUND - The specified system semaphore name was not found. . +Language=Russian +ERROR_SEM_NOT_FOUND - ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ð³Ð¾ ÑÐµÐ¼Ð°ÑÐ¾ÑÐ°. +. MessageId=188 Severity=Success @@ -1148,6 +1573,9 @@ Language=English ERROR_INVALID_STARTING_CODESEG - The operating system cannot run %1. . +Language=Russian +ERROR_INVALID_STARTING_CODESEG - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=189 Severity=Success @@ -1156,6 +1584,9 @@ Language=English ERROR_INVALID_STACKSEG - The operating system cannot run %1. . +Language=Russian +ERROR_INVALID_STACKSEG - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=190 Severity=Success @@ -1164,6 +1595,9 @@ Language=English ERROR_INVALID_MODULETYPE - The operating system cannot run %1. . +Language=Russian +ERROR_INVALID_MODULETYPE - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=191 Severity=Success @@ -1172,6 +1606,9 @@ Language=English ERROR_INVALID_EXE_SIGNATURE - Cannot run %1 in Win32 mode. . +Language=Russian +ERROR_INVALID_EXE_SIGNATURE - ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ "%1" Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ Win32. +. MessageId=192 Severity=Success @@ -1180,6 +1617,9 @@ Language=English ERROR_EXE_MARKED_INVALID - The operating system cannot run %1. . +Language=Russian +ERROR_EXE_MARKED_INVALID - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=193 Severity=Success @@ -1188,6 +1628,9 @@ Language=English ERROR_BAD_EXE_FORMAT - %1 is not a valid Win32 application. . +Language=Russian +ERROR_BAD_EXE_FORMAT - "%1" Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼ Win32. +. MessageId=194 Severity=Success @@ -1196,6 +1639,9 @@ Language=English ERROR_ITERATED_DATA_EXCEEDS_64k - The operating system cannot run %1. . +Language=Russian +ERROR_ITERATED_DATA_EXCEEDS_64k - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=195 Severity=Success @@ -1204,6 +1650,9 @@ Language=English ERROR_INVALID_MINALLOCSIZE - The operating system cannot run %1. . +Language=Russian +ERROR_INVALID_MINALLOCSIZE - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=196 Severity=Success @@ -1212,6 +1661,9 @@ Language=English ERROR_DYNLINK_FROM_INVALID_RING - The operating system cannot run this application program. . +Language=Russian +ERROR_DYNLINK_FROM_INVALID_RING - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ ÑÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ. +. MessageId=197 Severity=Success @@ -1220,6 +1672,9 @@ Language=English ERROR_IOPL_NOT_ENABLED - The operating system is not presently configured to run this application. . +Language=Russian +ERROR_IOPL_NOT_ENABLED - ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ Ð½Ðµ ÑÐ°ÑÑÑÐ¸ÑÐ°Ð½Ð° Ð½Ð° Ð·Ð°Ð¿ÑÑÐº ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ. +. MessageId=198 Severity=Success @@ -1228,6 +1683,9 @@ Language=English ERROR_INVALID_SEGDPL - The operating system cannot run %1. . +Language=Russian +ERROR_INVALID_SEGDPL - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=199 Severity=Success @@ -1236,6 +1694,9 @@ Language=English ERROR_AUTODATASEG_EXCEEDS_64k - The operating system cannot run this application program. . +Language=Russian +ERROR_AUTODATASEG_EXCEEDS_64k - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ ÑÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ. +. MessageId=200 Severity=Success @@ -1244,6 +1705,9 @@ Language=English ERROR_RING2SEG_MUST_BE_MOVABLE - The code segment cannot be greater than or equal to 64K. . +Language=Russian +ERROR_RING2SEG_MUST_BE_MOVABLE - Ð¡ÐµÐ³Ð¼ÐµÐ½Ñ ÐºÐ¾Ð´Ð° Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð¼ÐµÐ½ÑÑÐµ 64 ÐÐ. +. MessageId=201 Severity=Success @@ -1252,6 +1716,9 @@ Language=English ERROR_RELOC_CHAIN_XEEDS_SEGLIM - The operating system cannot run %1. . +Language=Russian +ERROR_RELOC_CHAIN_XEEDS_SEGLIM - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=202 Severity=Success @@ -1260,6 +1727,9 @@ Language=English ERROR_INFLOOP_IN_RELOC_CHAIN - The operating system cannot run %1. . +Language=Russian +ERROR_INFLOOP_IN_RELOC_CHAIN - ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ "%1". +. MessageId=203 Severity=Success @@ -1268,6 +1738,9 @@ Language=English ERROR_ENVVAR_NOT_FOUND - The system could not find the environment option that was entered. . +Language=Russian +ERROR_ENVVAR_NOT_FOUND - Ð¡Ð¸ÑÑÐµÐ¼Ðµ Ð½Ðµ ÑÐ´Ð°ÐµÑÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ ÑÑÐµÐ´Ñ. +. MessageId=205 Severity=Success @@ -1276,6 +1749,9 @@ Language=English ERROR_NO_SIGNAL_SENT - No process in the command subtree has a signal handler. . +Language=Russian +ERROR_NO_SIGNAL_SENT - ÐÐ¸ Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ð² Ð² Ð´ÐµÑÐµÐ²Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ° ÑÐ¸Ð³Ð½Ð°Ð»Ð¾Ð². +. MessageId=206 Severity=Success @@ -1284,6 +1760,9 @@ Language=English ERROR_FILENAME_EXCED_RANGE - The filename or extension is too long. . +Language=Russian +ERROR_FILENAME_EXCED_RANGE - ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð° Ð¸Ð»Ð¸ ÐµÐ³Ð¾ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ðµ Ð¸Ð¼ÐµÐµÑ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑÑÑÑ Ð´Ð»Ð¸Ð½Ñ. +. MessageId=207 Severity=Success @@ -1292,6 +1771,9 @@ Language=English ERROR_RING2_STACK_IN_USE - The ring 2 stack is in use. . +Language=Russian +ERROR_RING2_STACK_IN_USE - ÐÐ¾Ð»ÑÑÐ¾ 2 ÑÑÐµÐºÐ° Ð·Ð°Ð½ÑÑÐ¾. +. MessageId=208 Severity=Success @@ -1300,6 +1782,9 @@ Language=English ERROR_META_EXPANSION_TOO_LONG - The global filename characters, * or ?, are entered incorrectly or too many global filename characters are specified. . +Language=Russian +ERROR_META_EXPANSION_TOO_LONG - ÐÐ¾Ð´ÑÑÐ°Ð½Ð¾Ð²Ð¾ÑÐ½ÑÐµ Ð·Ð½Ð°ÐºÐ¸ * Ð¸/Ð¸Ð»Ð¸ ? Ð·Ð°Ð´Ð°Ð½Ñ Ð½ÐµÐ²ÐµÑÐ½Ð¾ Ð¸Ð»Ð¸ Ð¾Ð±ÑÐ°Ð·ÑÑÑ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ°Ð±Ð»Ð¾Ð½ Ð¸Ð¼ÐµÐ½Ð¸. +. MessageId=209 Severity=Success @@ -1308,6 +1793,9 @@ Language=English ERROR_INVALID_SIGNAL_NUMBER - The signal being posted is not correct. . +Language=Russian +ERROR_INVALID_SIGNAL_NUMBER - ÐÑÐ¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÐ¹ ÑÐ¸Ð³Ð½Ð°Ð» Ð½ÐµÐ²ÐµÑÐµÐ½. +. MessageId=210 Severity=Success @@ -1316,6 +1804,9 @@ Language=English ERROR_THREAD_1_INACTIVE - The signal handler cannot be set. . +Language=Russian +ERROR_THREAD_1_INACTIVE - ÐÐµ ÑÐ´Ð°ÐµÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÑÐ¸Ðº ÑÐ¸Ð³Ð½Ð°Ð»Ð¾Ð². +. MessageId=212 Severity=Success @@ -1324,6 +1815,9 @@ Language=English ERROR_LOCKED - The segment is locked and cannot be reallocated. . +Language=Russian +ERROR_LOCKED - Ð¡ÐµÐ³Ð¼ÐµÐ½Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½. +. MessageId=214 Severity=Success @@ -1332,6 +1826,9 @@ Language=English ERROR_TOO_MANY_MODULES - Too many dynamic-link modules are attached to this program or dynamic-link module. . +Language=Russian +ERROR_TOO_MANY_MODULES - Ð ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð»Ð¸ Ð¼Ð¾Ð´ÑÐ»Ñ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¾ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð¸Ð½Ð°Ð¼Ð¸ÑÐµÑÐºÐ¸ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÐ¼ÑÑ Ð¼Ð¾Ð´ÑÐ»ÐµÐ¹. +. MessageId=215 Severity=Success @@ -1339,6 +1836,9 @@ SymbolicName=ERROR_NESTING_NOT_ALLOWED Language=English ERROR_NESTING_NOT_ALLOWED - Cannot nest calls to LoadModule. +. +Language=Russian +ERROR_NESTING_NOT_ALLOWED - ÐÑÐ·Ð¾Ð²Ñ LoadModule Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð²Ð»Ð¾Ð¶ÐµÐ½Ñ. . MessageId=216

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs