Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[pschweitzer] 65475: [NTFS] Add the reparse point attribute definition

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Nov 24 20:02:40 2014 New Revision: 65475 URL: http://svn.reactos.org/svn/reactos?rev=65475&view=rev Log: [NTFS] Add the reparse point attribute definition Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Nov 24 20:02:40 2014 @@ -380,6 +380,13 @@ ULONG Unknown2; } VOLINFO_ATTRIBUTE, *PVOLINFO_ATTRIBUTE; +typedef struct { + ULONG ReparseTag; + USHORT DataLength; + USHORT Reserved; + UCHAR Data[1]; +} REPARSE_POINT_ATTRIBUTE, *PREPARSE_POINT_ATTRIBUTE; + typedef struct { NTFSIDENTIFIER Identifier;

10 years, 1 month

[pschweitzer] 65474: [NTFS] Warn about unimplemented sub-node browsing while looking into a MFT directory stream. Might likely explain why we cannnot enumerate all the files on a Win7 volume.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Nov 24 20:01:34 2014 New Revision: 65474 URL: http://svn.reactos.org/svn/reactos?rev=65474&view=rev Log: [NTFS] Warn about unimplemented sub-node browsing while looking into a MFT directory stream. Might likely explain why we cannnot enumerate all the files on a Win7 volume. Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Mon Nov 24 20:01:34 2014 @@ -566,6 +566,14 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { + UNICODE_STRING EntryName; + EntryName.Buffer = IndexEntry->FileName.Name; + EntryName.Length = + EntryName.MaximumLength = IndexEntry->FileName.NameLength * sizeof(WCHAR); + + if (IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) + DPRINT1("Warning: sub-node browsing unimplemented! (%wZ)\n", &EntryName); + if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && CurrentEntry >= *FirstEntry && CompareFileName(FileName, IndexEntry, DirSearch)) @@ -657,6 +665,14 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { + UNICODE_STRING EntryName; + EntryName.Buffer = IndexEntry->FileName.Name; + EntryName.Length = + EntryName.MaximumLength = IndexEntry->FileName.NameLength * sizeof(WCHAR); + + if (IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) + DPRINT1("Warning: sub-node browsing unimplemented! (%wZ)\n", &EntryName); + if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && CurrentEntry >= *FirstEntry && CompareFileName(FileName, IndexEntry, DirSearch))

10 years, 1 month

[pschweitzer] 65473: [NTFS] ASSERT -> NT_VERIFY Spotted by Thomas. Thanks :-)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Nov 24 19:54:22 2014 New Revision: 65473 URL: http://svn.reactos.org/svn/reactos?rev=65473&view=rev Log: [NTFS] ASSERT -> NT_VERIFY Spotted by Thomas. Thanks :-) Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Mon Nov 24 19:54:22 2014 @@ -478,7 +478,7 @@ UNICODE_STRING IntFileName; if (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX) { - ASSERT(NT_SUCCESS(RtlUpcaseUnicodeString(&IntFileName, FileName, TRUE))); + NT_VERIFY(NT_SUCCESS(RtlUpcaseUnicodeString(&IntFileName, FileName, TRUE))); Alloc = TRUE; } else

10 years, 1 month

[jimtabor] 65472: [NtUser] - Synchronize mouse messages. Part II - Dedicated to Giannis Adamopoulos and Amine Khaldi. - Additional fixes are added. - This should be more accurate, based on "Hit Tes...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 24 02:50:18 2014 New Revision: 65472 URL: http://svn.reactos.org/svn/reactos?rev=65472&view=rev Log: [NtUser] - Synchronize mouse messages. Part II - Dedicated to Giannis Adamopoulos and Amine Khaldi. - Additional fixes are added. - This should be more accurate, based on "Hit Testing: Which HWND is the mouse over?": http://blogs.msdn.com/b/dwayneneed/archive/2008/09/08/transparent-windows-i… - Note: Older FireFox menu item hilite select seem to work now, do not need to keep moving the mouse to keep it hilited to be selected. - Test results: https://reactos.org/sites/all/modules/reactos/testman/compare.php?ids=33709… Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Mon Nov 24 02:50:18 2014 @@ -936,10 +936,16 @@ Msg.lParam |= KF_MENUMODE << 16; } + // Post mouse move before posting key buttons, to keep it syned. + if (pFocusQueue->QF_flags & QF_MOUSEMOVED) + { + IntCoalesceMouseMove(pti); + } + /* Post a keyboard message */ TRACE("Posting keyboard msg %u wParam 0x%x lParam 0x%x\n", Msg.message, Msg.wParam, Msg.lParam); if (!Wnd) {ERR("Window is NULL\n");} - MsqPostMessage(pti, &Msg, TRUE, QS_KEY, 0); + MsqPostMessage(pti, &Msg, TRUE, QS_KEY, 0, dwExtraInfo); } return TRUE; @@ -1154,7 +1160,7 @@ NewMsg.message = (lpMsg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; NewMsg.wParam = HIWORD(lpMsg->lParam); NewMsg.lParam = LOWORD(lpMsg->lParam); - MsqPostMessage(pti, &NewMsg, FALSE, QS_KEY, 0); + MsqPostMessage(pti, &NewMsg, FALSE, QS_KEY, 0, 0); return TRUE; } @@ -1183,7 +1189,7 @@ { TRACE("Msg: %x '%lc' (%04x) %08x\n", NewMsg.message, wch[i], wch[i], NewMsg.lParam); NewMsg.wParam = wch[i]; - MsqPostMessage(pti, &NewMsg, FALSE, QS_KEY, 0); + MsqPostMessage(pti, &NewMsg, FALSE, QS_KEY, 0, 0); } bResult = TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Mon Nov 24 02:50:18 2014 @@ -802,6 +802,12 @@ pti->timeLast = LargeTickCount.u.LowPart; pti->pcti->tickLastMsgChecked = LargeTickCount.u.LowPart; + // Post mouse moves while looping through peek messages. + if (pti->MessageQueue->QF_flags & QF_MOUSEMOVED) + { + IntCoalesceMouseMove(pti); + } + /* Dispatch sent messages here. */ while ( co_MsqDispatchOneSentMessage(pti) ) { @@ -1087,7 +1093,7 @@ KeQueryTickCount(&LargeTickCount); Message.time = MsqCalculateMessageTime(&LargeTickCount); - MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0); + MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, 0); return TRUE; } @@ -1218,7 +1224,7 @@ } else { - MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0); + MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, 0); } } return TRUE; @@ -1411,6 +1417,7 @@ CLEANUP: if (Window) UserDerefObjectCo(Window); + // Current Thread and it's a Copy Data message, then free kernel memory. if ( !ptiSendTo && Msg == WM_COPYDATA ) { ExFreePool((PVOID) lParam); @@ -1677,7 +1684,7 @@ END_CLEANUP; } - +#if 0 /* This HACK function posts a message if the destination's message queue belongs to another thread, otherwise it sends the message. It does not support broadcast @@ -1721,6 +1728,7 @@ return (LRESULT)Result; } +#endif static LRESULT FASTCALL co_IntDoSendMessage( HWND hWnd, Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Mon Nov 24 02:50:18 2014 @@ -15,6 +15,9 @@ static PPAGED_LOOKASIDE_LIST pgMessageLookasideList; PUSER_MESSAGE_QUEUE gpqCursor; +ULONG_PTR gdwMouseMoveExtraInfo = 0; +DWORD gdwMouseMoveTimeStamp = 0; + /* FUNCTIONS *****************************************************************/ @@ -311,6 +314,36 @@ } } +/* + Get down key states from the queue of prior processed input message key states. + + This fixes the left button dragging on the desktop and release sticking outline issue. + USB Tablet pointer seems to stick the most and leaves the box outline displayed. + */ +WPARAM FASTCALL +MsqGetDownKeyState(PUSER_MESSAGE_QUEUE MessageQueue) +{ + WPARAM ret = 0; + + if (gspv.bMouseBtnSwap) + { + if (IS_KEY_DOWN(MessageQueue->afKeyState, VK_RBUTTON)) ret |= MK_LBUTTON; + if (IS_KEY_DOWN(MessageQueue->afKeyState, VK_LBUTTON)) ret |= MK_RBUTTON; + } + else + { + if (IS_KEY_DOWN(MessageQueue->afKeyState, VK_LBUTTON)) ret |= MK_LBUTTON; + if (IS_KEY_DOWN(MessageQueue->afKeyState, VK_RBUTTON)) ret |= MK_RBUTTON; + } + + if (IS_KEY_DOWN(MessageQueue->afKeyState, VK_MBUTTON)) ret |= MK_MBUTTON; + if (IS_KEY_DOWN(MessageQueue->afKeyState, VK_SHIFT)) ret |= MK_SHIFT; + if (IS_KEY_DOWN(MessageQueue->afKeyState, VK_CONTROL)) ret |= MK_CONTROL; + if (IS_KEY_DOWN(MessageQueue->afKeyState, VK_XBUTTON1)) ret |= MK_XBUTTON1; + if (IS_KEY_DOWN(MessageQueue->afKeyState, VK_XBUTTON2)) ret |= MK_XBUTTON2; + return ret; +} + HANDLE FASTCALL IntMsqSetWakeMask(DWORD WakeMask) { @@ -397,26 +430,18 @@ VOID FASTCALL ClearMsgBitsMask(PTHREADINFO pti, UINT MessageBits) { - PUSER_MESSAGE_QUEUE Queue; UINT ClrMask = 0; - Queue = pti->MessageQueue; - if (MessageBits & QS_KEY) { if (--pti->nCntsQBits[QSRosKey] == 0) ClrMask |= QS_KEY; } - if (MessageBits & QS_MOUSEMOVE) // ReactOS hard coded. + if (MessageBits & QS_MOUSEMOVE) { // Account for tracking mouse moves.. if (pti->nCntsQBits[QSRosMouseMove]) { pti->nCntsQBits[QSRosMouseMove] = 0; // Throttle down count. Up to > 3:1 entries are ignored. - } - // Handle mouse move bits here. - if (Queue->MouseMoved) - { ClrMask |= QS_MOUSEMOVE; - Queue->MouseMoved = FALSE; } } if (MessageBits & QS_MOUSEBUTTON) @@ -472,10 +497,11 @@ } /* - Post Mouse Move. + Post the move or update the message still pending to be processed. + Do not overload the queue with mouse move messages. */ VOID FASTCALL -MsqPostMouseMove(PTHREADINFO pti, MSG* Msg) +MsqPostMouseMove(PTHREADINFO pti, MSG* Msg, LONG_PTR ExtraInfo) { PUSER_MESSAGE Message; PLIST_ENTRY ListHead; @@ -483,22 +509,59 @@ ListHead = &MessageQueue->HardwareMessagesListHead; - MessageQueue->MouseMoved = TRUE; - + // Do nothing if empty. if (!IsListEmpty(ListHead->Flink)) - { // Look at the end of the list, + { + // Look at the end of the list, Message = CONTAINING_RECORD(ListHead->Blink, USER_MESSAGE, ListEntry); - // If the mouse move message is existing, + + // If the mouse move message is existing on the list, if (Message->Msg.message == WM_MOUSEMOVE) { - TRACE("Post Old MM Message in Q\n"); - Message->Msg = *Msg; // Overwrite the message with updated data! + // Overwrite the message with updated data! + Message->Msg = *Msg; + MsqWakeQueue(pti, QS_MOUSEMOVE, TRUE); return; } } - TRACE("Post New MM Message to Q\n"); - MsqPostMessage(pti, Msg, TRUE, QS_MOUSEMOVE, 0); + + MsqPostMessage(pti, Msg, TRUE, QS_MOUSEMOVE, 0, ExtraInfo); +} + +/* + Bring together the mouse move message. + Named "Coalesce" from Amine email ;^) (jt). + */ +VOID FASTCALL +IntCoalesceMouseMove(PTHREADINFO pti) +{ + MSG Msg; + LARGE_INTEGER LargeTickCount; + + // Force time stamp to update, keeping message time in sync. + if (gdwMouseMoveTimeStamp == 0) + { + KeQueryTickCount(&LargeTickCount); + gdwMouseMoveTimeStamp = MsqCalculateMessageTime(&LargeTickCount); + } + + // Build mouse move message. + Msg.hwnd = NULL; + Msg.message = WM_MOUSEMOVE; + Msg.wParam = 0; + Msg.lParam = MAKELONG(gpsi->ptCursor.x, gpsi->ptCursor.y); + Msg.time = gdwMouseMoveTimeStamp; + Msg.pt = gpsi->ptCursor; + + // Post the move. + MsqPostMouseMove(pti, &Msg, gdwMouseMoveExtraInfo); + + // Zero the time stamp. + gdwMouseMoveTimeStamp = 0; + + // Clear flag since the move was posted. + pti->MessageQueue->QF_flags &= ~QF_MOUSEMOVED; } VOID FASTCALL @@ -626,7 +689,10 @@ gpqCursor = MessageQueue; /* Mouse move is a special case */ - MsqPostMouseMove(pti, Msg); + MessageQueue->QF_flags |= QF_MOUSEMOVED; + gdwMouseMoveExtraInfo = dwExtraInfo; + gdwMouseMoveTimeStamp = Msg->time; + MsqWakeQueue(pti, QS_MOUSEMOVE, TRUE); } else { @@ -636,8 +702,15 @@ // ptiLastInput = pti; // Once this is set during Reboot or Shutdown, this prevents the exit window having foreground. // Find all the Move Mouse calls and fix mouse set active focus issues...... } + + // Post mouse move before posting mouse buttons, keep it in sync. + if (pti->MessageQueue->QF_flags & QF_MOUSEMOVED) + { + IntCoalesceMouseMove(pti); + } + TRACE("Posting mouse message to hwnd=%p!\n", UserHMGetHandle(pwnd)); - MsqPostMessage(pti, Msg, TRUE, QS_MOUSEBUTTON, 0); + MsqPostMessage(pti, Msg, TRUE, QS_MOUSEBUTTON, 0, dwExtraInfo); } } else if (hdcScreen) @@ -1207,7 +1280,8 @@ MSG* Msg, BOOLEAN HardwareMessage, DWORD MessageBits, - DWORD dwQEvent) + DWORD dwQEvent, + LONG_PTR ExtraInfo) { PUSER_MESSAGE Message; PUSER_MESSAGE_QUEUE MessageQueue; @@ -1244,6 +1318,7 @@ if (Msg->message == WM_HOTKEY) MessageBits |= QS_HOTKEY; // Justin Case, just set it. Message->dwQEvent = dwQEvent; + Message->ExtraInfo = ExtraInfo; Message->QS_Flags = MessageBits; Message->pti = pti; MsqWakeQueue(pti, MessageBits, TRUE); @@ -1375,12 +1450,13 @@ } else { - pwndMsg = co_WinPosWindowFromPoint(NULL, &msg->pt, &hittest, FALSE);//TRUE); + pwndMsg = co_WinPosWindowFromPoint(pwndMsg, &msg->pt, &hittest, FALSE); } TRACE("Got mouse message for %p, hittest: 0x%x\n", msg->hwnd, hittest); - if (pwndMsg == NULL || pwndMsg->head.pti != pti) + // Null window or not the same "Hardware" message queue. + if (pwndMsg == NULL || pwndMsg->head.pti->MessageQueue != pti->MessageQueue) { /* Remove and ignore the message */ *RemoveMessages = TRUE; @@ -1469,6 +1545,12 @@ { TRACE("Message out of range!!!\n"); RETURN(FALSE); + } + + // Update mouse move down keys. + if (message == WM_MOUSEMOVE) + { + msg->wParam = MsqGetDownKeyState(MessageQueue); } } @@ -1739,7 +1821,8 @@ */ if ( ( !Window || // 1 ( Window == PWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window != PWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window != PWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) || // 3 + ( CurrentMessage->Msg.message == WM_MOUSEMOVE ) ) && // Null window for mouse moves. ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Mon Nov 24 02:50:18 2014 @@ -51,9 +51,7 @@ /* Queue for hardware messages for the queue. */ LIST_ENTRY HardwareMessagesListHead; - /* True if a WM_MOUSEMOVE is pending */ - BOOLEAN MouseMoved; - /* Current WM_MOUSEMOVE message */ + /* Last click message for translating double clicks */ MSG msgDblClk; /* Current capture window for this queue. */ PWND spwndCapture; @@ -92,7 +90,7 @@ #define QF_FMENUSTATUSBREAK 0x00000004 #define QF_FMENUSTATUS 0x00000008 #define QF_FF10STATUS 0x00000010 -#define QF_MOUSEMOVED 0x00000020 // See MouseMoved. +#define QF_MOUSEMOVED 0x00000020 #define QF_ACTIVATIONCHANGE 0x00000040 #define QF_TABSWITCHING 0x00000080 #define QF_KEYSTATERESET 0x00000100 @@ -122,7 +120,7 @@ UINT uTimeout, BOOL Block, INT HookMessage, ULONG_PTR *uResult); PUSER_MESSAGE FASTCALL MsqCreateMessage(LPMSG Msg); VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message); -VOID FASTCALL MsqPostMessage(PTHREADINFO, MSG*, BOOLEAN, DWORD, DWORD); +VOID FASTCALL MsqPostMessage(PTHREADINFO, MSG*, BOOLEAN, DWORD, DWORD, LONG_PTR); VOID FASTCALL MsqPostQuitMessage(PTHREADINFO pti, ULONG ExitCode); BOOLEAN APIENTRY MsqPeekMessage(IN PTHREADINFO pti, @@ -186,6 +184,7 @@ BOOL HasPackedLParam, INT HookMessage); +VOID FASTCALL IntCoalesceMouseMove(PTHREADINFO); LRESULT FASTCALL IntDispatchMessage(MSG* Msg); BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg, UINT flags); VOID FASTCALL co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook); @@ -246,6 +245,7 @@ VOID FASTCALL MsqWakeQueue(PTHREADINFO,DWORD,BOOL); VOID FASTCALL ClearMsgBitsMask(PTHREADINFO,UINT); BOOL FASTCALL IntCallMsgFilter(LPMSG,INT); +WPARAM FASTCALL MsqGetDownKeyState(PUSER_MESSAGE_QUEUE); int UserShowCursor(BOOL bShow); PCURICON_OBJECT Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Mon Nov 24 02:50:18 2014 @@ -320,7 +320,7 @@ { if (pDesk->htEx == HTCLIENT) // In a client area. { - wParam = UserGetMouseButtonsState(); + wParam = MsqGetDownKeyState(pWnd->head.pti->MessageQueue); Msg = WM_MOUSEHOVER; if (pWnd->ExStyle & WS_EX_LAYOUTRTL) @@ -405,7 +405,7 @@ Msg.wParam = (WPARAM) pTmr->nID; Msg.lParam = (LPARAM) pTmr->pfn; - MsqPostMessage(pti, &Msg, FALSE, (QS_POSTMESSAGE|QS_ALLPOSTMESSAGE), 0); + MsqPostMessage(pti, &Msg, FALSE, (QS_POSTMESSAGE|QS_ALLPOSTMESSAGE), 0, 0); pTmr->flags &= ~TMRF_READY; ClearMsgBitsMask(pti, QS_TIMER); Hit = TRUE;

10 years, 1 month

[hbelusca] 65471: [CONSRV]: Implement CREATE_NO_WINDOW support.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 23 23:04:45 2014 New Revision: 65471 URL: http://svn.reactos.org/svn/reactos?rev=65471&view=rev Log: [CONSRV]: Implement CREATE_NO_WINDOW support. Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/init.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sun Nov 23 23:04:45 2014 @@ -922,6 +922,7 @@ /* Initialize the console initialization info structure */ ConsoleInitInfo.ConsoleStartInfo = AllocConsoleRequest->ConsoleStartInfo; + ConsoleInitInfo.IsWindowVisible = TRUE; // The console window is always visible. ConsoleInitInfo.TitleLength = AllocConsoleRequest->TitleLength; ConsoleInitInfo.ConsoleTitle = AllocConsoleRequest->ConsoleTitle; ConsoleInitInfo.DesktopLength = AllocConsoleRequest->DesktopLength; Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.h [iso-8859-1] Sun Nov 23 23:04:45 2014 @@ -11,6 +11,7 @@ typedef struct _CONSOLE_INIT_INFO { PCONSOLE_START_INFO ConsoleStartInfo; + BOOLEAN IsWindowVisible; ULONG TitleLength; PWCHAR ConsoleTitle; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sun Nov 23 23:04:45 2014 @@ -686,7 +686,11 @@ SetWindowLongPtrW(GuiData->hWindow, GWLP_USERDATA, (DWORD_PTR)GuiData); - SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); + if (GuiData->IsWindowVisible) + { + SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); + } + // FIXME: HACK: Potential HACK for CORE-8129; see revision 63595. //CreateSysMenu(GuiData->hWindow); @@ -1048,6 +1052,9 @@ PAINTSTRUCT ps; RECT rcPaint; + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return; + BeginPaint(GuiData->hWindow, &ps); if (ps.hdc != NULL && ps.rcPaint.left < ps.rcPaint.right && @@ -1095,6 +1102,9 @@ OnPaletteChanged(PGUI_CONSOLE_DATA GuiData) { PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; + + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return; // See WM_PALETTECHANGED message // if ((HWND)wParam == hWnd) break; @@ -1305,6 +1315,9 @@ { PCONSRV_CONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER Buff; + + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return; SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CURSOR_BLINK_TIME, NULL); @@ -1431,7 +1444,11 @@ { PGUI_CONSOLE_DATA GuiData = GuiGetGuiData(hWnd); - KillTimer(hWnd, CONGUI_UPDATE_TIMER); + if (GuiData->IsWindowVisible) + { + KillTimer(hWnd, CONGUI_UPDATE_TIMER); + } + GetSystemMenu(hWnd, TRUE); if (GuiData) @@ -1868,6 +1885,9 @@ { PCONSRV_CONSOLE Console = GuiData->Console; + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return; + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; if ((GuiData->WindowSizeLock == FALSE) && @@ -2191,6 +2211,9 @@ case WM_SETCURSOR: { + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) goto Default; + /* * The message was sent because we are manually triggering a change. * Check whether the mouse is indeed present on this console window @@ -2263,6 +2286,9 @@ case WM_CONTEXTMENU: { + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) break; + if (DefWindowProcW(hWnd /*GuiData->hWindow*/, WM_NCHITTEST, 0, lParam) == HTCLIENT) { HMENU hMenu = CreatePopupMenu(); @@ -2391,6 +2417,9 @@ DWORD Width, Height; UINT WidthUnit, HeightUnit; + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) break; + GetScreenBufferSizeUnits(Buff, GuiData, &WidthUnit, &HeightUnit); Width = Buff->ScreenBufferSize.X * WidthUnit ; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h [iso-8859-1] Sun Nov 23 23:04:45 2014 @@ -40,6 +40,8 @@ HANDLE hGuiInitEvent; HANDLE hGuiTermEvent; + BOOLEAN IsWindowVisible; + POINT OldCursor; LONG_PTR WndStyle; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Nov 23 23:04:45 2014 @@ -39,6 +39,7 @@ PCONSOLE_INFO ConsoleInfo; PCONSOLE_START_INFO ConsoleStartInfo; ULONG ProcessId; + BOOLEAN IsWindowVisible; } GUI_INIT_INFO, *PGUI_INIT_INFO; static BOOL ConsInitialized = FALSE; @@ -179,7 +180,7 @@ CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, + GuiData->IsWindowVisible ? HWND_DESKTOP : HWND_MESSAGE, NULL, ConSrvDllInstance, (PVOID)GuiData); @@ -204,22 +205,33 @@ GuiData->GuiInfo.WindowOrigin.x = rcWnd.left; GuiData->GuiInfo.WindowOrigin.y = rcWnd.top; - /* Move and resize the window to the user's values */ - /* CAN WE DEADLOCK ?? */ - GuiConsoleMoveWindow(GuiData); // FIXME: This MUST be done via the CreateWindowExW call. - SendMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0); + if (GuiData->IsWindowVisible) + { + /* Move and resize the window to the user's values */ + /* CAN WE DEADLOCK ?? */ + GuiConsoleMoveWindow(GuiData); // FIXME: This MUST be done via the CreateWindowExW call. + SendMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0); + } // FIXME: HACK: Potential HACK for CORE-8129; see revision 63595. CreateSysMenu(GuiData->hWindow); - /* Switch to full-screen mode if necessary */ - // FIXME: Move elsewhere, it cause misdrawings of the window. - if (GuiData->GuiInfo.FullScreen) SwitchFullScreen(GuiData, TRUE); - - DPRINT("PM_CREATE_CONSOLE -- showing window\n"); - // ShowWindow(NewWindow, (int)GuiData->GuiInfo.ShowWindow); - ShowWindowAsync(NewWindow, (int)GuiData->GuiInfo.ShowWindow); - DPRINT("Window showed\n"); + if (GuiData->IsWindowVisible) + { + /* Switch to full-screen mode if necessary */ + // FIXME: Move elsewhere, it cause misdrawings of the window. + if (GuiData->GuiInfo.FullScreen) SwitchFullScreen(GuiData, TRUE); + + DPRINT("PM_CREATE_CONSOLE -- showing window\n"); + // ShowWindow(NewWindow, (int)GuiData->GuiInfo.ShowWindow); + ShowWindowAsync(NewWindow, (int)GuiData->GuiInfo.ShowWindow); + DPRINT("Window showed\n"); + } + else + { + DPRINT("PM_CREATE_CONSOLE -- hidden window\n"); + ShowWindowAsync(NewWindow, SW_HIDE); + } continue; } @@ -369,6 +381,7 @@ GuiData->Console = Console; GuiData->ActiveBuffer = Console->ActiveBuffer; GuiData->hWindow = NULL; + GuiData->IsWindowVisible = GuiInitInfo->IsWindowVisible; /* The console can be resized */ Console->FixedSize = FALSE; @@ -383,33 +396,36 @@ /* 1. Load the default settings */ GuiConsoleGetDefaultSettings(&TermInfo, GuiInitInfo->ProcessId); - /* 3. Load the remaining console settings via the registry */ - if ((ConsoleStartInfo->dwStartupFlags & STARTF_TITLEISLINKNAME) == 0) - { - /* Load the terminal infos from the registry */ - GuiConsoleReadUserSettings(&TermInfo, - ConsoleInfo->ConsoleTitle, - GuiInitInfo->ProcessId); - - /* - * Now, update them with the properties the user might gave to us - * via the STARTUPINFO structure before calling CreateProcess - * (and which was transmitted via the ConsoleStartInfo structure). - * We therefore overwrite the values read in the registry. - */ - if (ConsoleStartInfo->dwStartupFlags & STARTF_USESHOWWINDOW) + if (GuiData->IsWindowVisible) + { + /* 2. Load the remaining console settings via the registry */ + if ((ConsoleStartInfo->dwStartupFlags & STARTF_TITLEISLINKNAME) == 0) { - TermInfo.ShowWindow = ConsoleStartInfo->wShowWindow; - } - if (ConsoleStartInfo->dwStartupFlags & STARTF_USEPOSITION) - { - TermInfo.AutoPosition = FALSE; - TermInfo.WindowOrigin.x = ConsoleStartInfo->dwWindowOrigin.X; - TermInfo.WindowOrigin.y = ConsoleStartInfo->dwWindowOrigin.Y; - } - if (ConsoleStartInfo->dwStartupFlags & STARTF_RUNFULLSCREEN) - { - TermInfo.FullScreen = TRUE; + /* Load the terminal infos from the registry */ + GuiConsoleReadUserSettings(&TermInfo, + ConsoleInfo->ConsoleTitle, + GuiInitInfo->ProcessId); + + /* + * Now, update them with the properties the user might gave to us + * via the STARTUPINFO structure before calling CreateProcess + * (and which was transmitted via the ConsoleStartInfo structure). + * We therefore overwrite the values read in the registry. + */ + if (ConsoleStartInfo->dwStartupFlags & STARTF_USESHOWWINDOW) + { + TermInfo.ShowWindow = ConsoleStartInfo->wShowWindow; + } + if (ConsoleStartInfo->dwStartupFlags & STARTF_USEPOSITION) + { + TermInfo.AutoPosition = FALSE; + TermInfo.WindowOrigin.x = ConsoleStartInfo->dwWindowOrigin.X; + TermInfo.WindowOrigin.y = ConsoleStartInfo->dwWindowOrigin.Y; + } + if (ConsoleStartInfo->dwStartupFlags & STARTF_RUNFULLSCREEN) + { + TermInfo.FullScreen = TRUE; + } } } @@ -539,6 +555,10 @@ SMALL_RECT* Region) { PGUI_CONSOLE_DATA GuiData = This->Data; + + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return; + DrawRegion(GuiData, Region); } @@ -558,6 +578,9 @@ if (NULL == GuiData || NULL == GuiData->hWindow) return; + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return; + Buff = GuiData->ActiveBuffer; if (GetType(Buff) != TEXTMODE_BUFFER) return; @@ -617,6 +640,9 @@ { PGUI_CONSOLE_DATA GuiData = This->Data; + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return TRUE; + if (GuiData->ActiveBuffer == Buff) { InvalidateCell(GuiData, Buff->CursorPosition.X, Buff->CursorPosition.Y); @@ -632,6 +658,9 @@ SHORT OldCursorY) { PGUI_CONSOLE_DATA GuiData = This->Data; + + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return TRUE; if (GuiData->ActiveBuffer == Buff) { @@ -935,6 +964,9 @@ if (NewMode & ~(CONSOLE_FULLSCREEN_MODE | CONSOLE_WINDOWED_MODE)) return FALSE; + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return TRUE; + FullScreen = ((NewMode & CONSOLE_FULLSCREEN_MODE) != 0); if (FullScreen != GuiData->GuiInfo.FullScreen) @@ -951,12 +983,15 @@ { PGUI_CONSOLE_DATA GuiData = This->Data; - /* Set the reference count */ - if (Show) ++GuiData->MouseCursorRefCount; - else --GuiData->MouseCursorRefCount; - - /* Effectively show (or hide) the cursor (use special values for (w|l)Param) */ - PostMessageW(GuiData->hWindow, WM_SETCURSOR, -1, -1); + if (GuiData->IsWindowVisible) + { + /* Set the reference count */ + if (Show) ++GuiData->MouseCursorRefCount; + else --GuiData->MouseCursorRefCount; + + /* Effectively show (or hide) the cursor (use special values for (w|l)Param) */ + PostMessageW(GuiData->hWindow, WM_SETCURSOR, -1, -1); + } return GuiData->MouseCursorRefCount; } @@ -966,6 +1001,9 @@ HCURSOR CursorHandle) { PGUI_CONSOLE_DATA GuiData = This->Data; + + /* Do nothing if the window is hidden */ + if (!GuiData->IsWindowVisible) return TRUE; /* * Set the cursor's handle. If the given handle is NULL, @@ -1068,6 +1106,7 @@ GuiInitInfo->ConsoleInfo = ConsoleInfo; GuiInitInfo->ConsoleStartInfo = ConsoleInitInfo->ConsoleStartInfo; GuiInitInfo->ProcessId = ProcessId; + GuiInitInfo->IsWindowVisible = ConsoleInitInfo->IsWindowVisible; /* Finally, initialize the frontend structure */ FrontEnd->Vtbl = &GuiVtbl; Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Sun Nov 23 23:04:45 2014 @@ -434,6 +434,7 @@ /* Initialize the console initialization info structure */ ConsoleInitInfo.ConsoleStartInfo = &ConnectInfo->ConsoleStartInfo; + ConsoleInitInfo.IsWindowVisible = ConnectInfo->IsWindowVisible; ConsoleInitInfo.TitleLength = ConnectInfo->TitleLength; ConsoleInitInfo.ConsoleTitle = ConnectInfo->ConsoleTitle; ConsoleInitInfo.DesktopLength = ConnectInfo->DesktopLength;

10 years, 1 month

[pschweitzer] 65470: [NTFS] - Fix $FILENAME_ATTRIBUTE definition to allow reading reparse points tag - Add missing file attribute (reparse point)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 23 20:52:59 2014 New Revision: 65470 URL: http://svn.reactos.org/svn/reactos?rev=65470&view=rev Log: [NTFS] - Fix $FILENAME_ATTRIBUTE definition to allow reading reparse points tag - Add missing file attribute (reparse point) Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Nov 23 20:52:59 2014 @@ -195,6 +195,7 @@ #define NTFS_FILE_TYPE_HIDDEN 0x2 #define NTFS_FILE_TYPE_SYSTEM 0x4 #define NTFS_FILE_TYPE_ARCHIVE 0x20 +#define NTFS_FILE_TYPE_REPARSE 0x400 #define NTFS_FILE_TYPE_COMPRESSED 0x800 #define NTFS_FILE_TYPE_DIRECTORY 0x10000000 @@ -308,7 +309,15 @@ ULONGLONG AllocatedSize; ULONGLONG DataSize; ULONG FileAttributes; - ULONG AlignmentOrReserved; + union + { + struct + { + USHORT PackedEaSize; + USHORT AlignmentOrReserved; + } EaInfo; + ULONG ReparseTag; + } Extended; UCHAR NameLength; UCHAR NameType; WCHAR Name[1];

10 years, 1 month

[hbelusca] 65469: [TASKMGR] - Show programs command line in taskmgr. Patch by Ismael Ferreras Morezuelas with minor modifications by me. - int nMaxCount --> ULONG nMaxCount (that makes everything c...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 23 20:10:15 2014 New Revision: 65469 URL: http://svn.reactos.org/svn/reactos?rev=65469&view=rev Log: [TASKMGR] - Show programs command line in taskmgr. Patch by Ismael Ferreras Morezuelas with minor modifications by me. - int nMaxCount --> ULONG nMaxCount (that makes everything clearer and removes MSVC warnings). CORE-5467 #resolve #comment Feature committed in revision 65469, cheers ;) Modified: trunk/reactos/base/applications/taskmgr/column.c trunk/reactos/base/applications/taskmgr/column.h trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/he-IL.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/perfdata.h trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/applications/taskmgr/resource.h trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/column.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/column.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/column.c [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -54,6 +54,7 @@ DECLARE_COLUMN_PRESET(IOREADBYTES, 70, FALSE) DECLARE_COLUMN_PRESET(IOWRITEBYTES, 70, FALSE) DECLARE_COLUMN_PRESET(IOOTHERBYTES, 70, FALSE) + DECLARE_COLUMN_PRESET(COMMANDLINE, 450, FALSE) }; static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); Modified: trunk/reactos/base/applications/taskmgr/column.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/column.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/column.h [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -47,7 +47,8 @@ #define COLUMN_IOREADBYTES 22 #define COLUMN_IOWRITEBYTES 23 #define COLUMN_IOOTHERBYTES 24 -#define COLUMN_NMAX 25 +#define COLUMN_COMMANDLINE 25 +#define COLUMN_NMAX 26 /* * temporary fix: @@ -104,6 +105,7 @@ #define Column_IOWriteBytes Columns[COLUMN_IOWRITEBYTES] #define Column_IOOther Columns[COLUMN_IOOTHER] #define Column_IOOtherBytes Columns[COLUMN_IOOTHERBYTES] +#define Column_CommandLine Columns[COLUMN_COMMANDLINE] void ProcessPage_OnViewSelectColumns(void); void AddColumns(void); Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "Ð/Ð Ð±Ð°Ð¹ÑÐ¾Ð²Ðµ Ð·Ð° Ð¿Ð¸ÑÐ°Ð½Ðµ", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 127, 65, 10 CONTROL "ÐÑÑÐ³Ð¸ Ð/Ð", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 138, 115, 10 CONTROL "ÐÑÑÐ³Ð¸ Ð/Ð Ð±Ð°Ð¹ÑÐ¾Ð²Ðµ", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 149, 115, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 160, 65, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "Ð/Ð Ð¿ÑÐ¾ÑÐµÑÐµÐ½Ð¸ Ð±Ð°Ð¹ÑÐ¾Ð²Ðµ" IDS_TAB_IOWRITESBYTES "Ð/Ð Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ð¸ Ð±Ð°Ð¹ÑÐ¾Ð²Ðµ" IDS_TAB_IOOTHERBYTES "Ð/Ð Ð´ÑÑÐ³Ð¸ Ð±Ð°Ð¹ÑÐ¾Ð²Ðµ" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&ÐÐ·Ð±Ð¾Ñ Ð½Ð° ÑÑÑÐ»Ð±Ð¾Ð²Ðµ..." IDS_MENU_16BITTASK "&ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° 16Ð±Ð¸ÑÐ¾Ð²Ð¸ Ð·Ð°Ð´Ð°ÑÐ¸" IDS_MENU_WINDOWS "&ÐÑÐ¾Ð·Ð¾ÑÑÐ¸" Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "I/O zapsanÃ© bajty", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 72, 10 CONTROL "I/O ostatnÃ", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 48, 10 CONTROL "I/O ostatnÃ bajty", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "I/O pÅeÄtenÃ© bajty" IDS_TAB_IOWRITESBYTES "I/O zapsanÃ© bajty" IDS_TAB_IOOTHERBYTES "I/O ostatnÃ bajty" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Vybrat sloupce..." IDS_MENU_16BITTASK "&Zobrazit 16-bitovÃ© Ãºlohy" IDS_MENU_WINDOWS "&Okna" Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "I/O Skrevet Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O Andet", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O Andre Bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "I/O Read Bytes" IDS_TAB_IOWRITESBYTES "I/O Write Bytes" IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Select Columns..." IDS_MENU_16BITTASK "&Show 16-bit tasks" IDS_MENU_WINDOWS "&Windows" Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "E/A-Bytes (Schreiben)", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 // 107 CONTROL "E/A (Andere)", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 105, 10 // 107 CONTROL "E/A-Bytes (Andere)", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 110, 10 // 107 + CONTROL "Befeh&lszeile", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 // 107 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "E/A-Bytes (Lesen)" IDS_TAB_IOWRITESBYTES "E/A-Bytes (Schreiben)" IDS_TAB_IOOTHERBYTES "E/A-Bytes (Andere)" + IDS_TAB_COMMANDLINE "Befehlszeile" IDS_MENU_SELECTCOLUMNS "&Spalten auswÃ¤hlen..." IDS_MENU_16BITTASK "&16-Bit-Tasks anzeigen" IDS_MENU_WINDOWS "&Fenster" Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "I/O Write Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O Other", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O Other Bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "I/O Read Bytes" IDS_TAB_IOWRITESBYTES "I/O Write Bytes" IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Select Columns..." IDS_MENU_16BITTASK "&Show 16-bit tasks" IDS_MENU_WINDOWS "&Windows" Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -313,6 +313,7 @@ CONTROL "I/O Write Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O Other", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O Other Bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -408,6 +409,7 @@ IDS_TAB_IOREADBYTES "I/O Read Bytes" IDS_TAB_IOWRITESBYTES "I/O Write Bytes" IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Select Columns..." IDS_MENU_16BITTASK "&Show 16-bit tasks" IDS_MENU_WINDOWS "&Windows" Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -292,7 +292,7 @@ DEFPUSHBUTTON "Aceptar", IDOK, 126, 178, 50, 14 // 84 PUSHBUTTON "Cancelar", IDCANCEL, 180, 178, 50, 14 // 138 LTEXT "Seleccione las columnas que aparecerÃ¡n en la pÃ¡gina de Procesos del Administrador de tareas.", IDC_STATIC, 7, 7, 221, 17 // 181 - CONTROL "Nombre de ruta de la &imagen", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 88, 10 // 56 + CONTROL "Nombre de ruta de la &imagen", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 105, 10 // 56 CONTROL "Identificador de proceso (&PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 120, 10 // 88 CONTROL "Uso de &CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 CONTROL "Ti&empo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 65, 10 // 48 @@ -301,8 +301,8 @@ CONTROL "Uso mÃ¡&ximo de la memoria", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 120, 10 // 82 CONTROL "Err&ores de pÃ¡gina", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 80, 10 // 53 CONTROL "O&bjetos de USUARIO", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 80, 10 // 62 - CONTROL "Lecturas de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 60, 10 // 49 - CONTROL "Bytes de lectura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 + CONTROL "Lecturas de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 70, 10 // 49 + CONTROL "Bytes de lectura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 85, 10 CONTROL "I&d. de sesiÃ³n", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 65, 10 // 50 CONTROL "&Nombre de usuario", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 75, 10 // 51 CONTROL "Diferencia de erro&res de pÃ¡gina", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 120, 10 // 107, 60 @@ -310,13 +310,14 @@ CONTROL "B&loque paginado", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 67, 10 // 107, 53 CONTROL "Blo&que no paginado", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 // 107 CONTROL "P&rioridad base", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 // 107 - CONTROL "&Recuento de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 // 107 - CONTROL "NÃº&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 59, 10 // 107 + CONTROL "&Recuento de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 105, 10 // 107 + CONTROL "NÃº&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 85, 10 // 107 CONTROL "Objetos &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 // 107 CONTROL "Escrituras de E/S", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 // 107 CONTROL "Bytes de escritura de E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 // 107 CONTROL "Otros de E/S", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 60, 10 CONTROL "Otros bytes de E/S", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 75, 10 + CONTROL "&LÃnea de comandos", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 75, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "Bytes de lectura de E/S" IDS_TAB_IOWRITESBYTES "Bytes de escritura de E/S" IDS_TAB_IOOTHERBYTES "Otros bytes de E/S" + IDS_TAB_COMMANDLINE "LÃnea de comandos" IDS_MENU_SELECTCOLUMNS "&Seleccionar columnas..." IDS_MENU_16BITTASK "Mos&trar tareas de 16-bit" IDS_MENU_WINDOWS "&Ventanas" Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "Octets d'Ã©criture E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 129, 127, 108, 10 CONTROL "Autres E/S", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 129, 138, 108, 10 CONTROL "Octets d'autres E/S", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 129, 149, 108, 10 + CONTROL "&Ligne de commande", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 129, 160, 95, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "Octets de lecture E/S" IDS_TAB_IOWRITESBYTES "Octets d'Ã©criture E/S" IDS_TAB_IOOTHERBYTES "Octets d'autres E/S" + IDS_TAB_COMMANDLINE "Ligne de commande" IDS_MENU_SELECTCOLUMNS "&SÃ©lectionner les colonnes..." IDS_MENU_16BITTASK "&Afficher les tÃ¢ches 16 bits" IDS_MENU_WINDOWS "&FenÃªtres" Modified: trunk/reactos/base/applications/taskmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "I/O Write Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O Other", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O Other Bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "I/O Read Bytes" IDS_TAB_IOWRITESBYTES "I/O Write Bytes" IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Select Columns..." IDS_MENU_16BITTASK "&Show 16-bit tasks" IDS_MENU_WINDOWS "&Windows" Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "I/O Ãrott bÃ¡jtok", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "EgyÃ©b I/O mÃ»veletek", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "EgyÃ©b I/O mÃ»veletek bÃ¡jtjai", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "I/O Olvasott bÃ¡jtok" IDS_TAB_IOWRITESBYTES "I/O Ãrott bÃ¡jtok" IDS_TAB_IOOTHERBYTES "EgyÃ©b I/O bÃ¡jtok" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Oszlopok kivÃ¡lasztÃ¡sa..." IDS_MENU_16BITTASK "&16bites feladatok megjelenÃtÃ©se" IDS_MENU_WINDOWS "&Ablak" Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "I/O Write Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O Other", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O Other Bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "I/O Read Bytes" IDS_TAB_IOWRITESBYTES "I/O Write Bytes" IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Select Columns..." IDS_MENU_16BITTASK "&Show 16-bit tasks" IDS_MENU_WINDOWS "&Windows" Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "Scritture I/O Byte", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 69, 10 CONTROL "Altro I/O", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "Altro I/O Bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "&Linea di comando", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "I/O Letture Bytes" IDS_TAB_IOWRITESBYTES "I/O Scritture Bytes" IDS_TAB_IOOTHERBYTES "I/O Altro Bytes" + IDS_TAB_COMMANDLINE "Linea di comando" IDS_MENU_SELECTCOLUMNS "&Selezione Colonne..." IDS_MENU_16BITTASK "&Mostra task 16-bit" IDS_MENU_WINDOWS "&Finestre" Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "I/O æ¸ãè¾¼ã¿ãã¤ãæ°", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O ãã®ä»", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O ãã®ä»ã®ãã¤ãæ°", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "I/O èªã¿åããã¤ãæ°" IDS_TAB_IOWRITESBYTES "I/O æ¸ãè¾¼ã¿ãã¤ãæ°" IDS_TAB_IOOTHERBYTES "I/O ãã®ä»ã®ãã¤ãæ°" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "åã®é¸æ(&S)..." IDS_MENU_16BITTASK "16 ããã ã¿ã¹ã¯ã®è¡¨ç¤º(&S)" IDS_MENU_WINDOWS "ã¦ã£ã³ãã¦(&W)" Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "I/O ì°ê¸° ë°ì´í¸", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O ê¸°í", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O ê¸°í ë°ì´í¸", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "I/O ì½ê¸° ë°ì´í¸" IDS_TAB_IOWRITESBYTES "I/O ì°ê¸° ë°ì´í¸" IDS_TAB_IOOTHERBYTES "I/O ê¸°í ë°ì´í¸" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "ì´ ì í(&S)" IDS_MENU_16BITTASK "16ë¹í¸ ìì ë³´ì´ê¸°(&S)" IDS_MENU_WINDOWS "ì°½(&W)" Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "I/O: geschreven bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 127, 100, 10 CONTROL "I/O: overig", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 138, 100, 10 CONTROL "I/O: overige bytes", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 149, 100, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 117, 160, 65, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "I/O: gelezen bytes" IDS_TAB_IOWRITESBYTES "I/O: geschreven bytes" IDS_TAB_IOOTHERBYTES "I/O: overige bytes" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Kolommen selecteren..." IDS_MENU_16BITTASK "16-&bits taken weergeven" IDS_MENU_WINDOWS "&Vensters" Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "I/O skrevne byte", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 70, 10 CONTROL "I/O Annet", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O Andre byte", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "I/O Leser Byte" IDS_TAB_IOWRITESBYTES "I/O Skriver Byte" IDS_TAB_IOOTHERBYTES "I/O Annet Byte" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Velg kolonner..." IDS_MENU_16BITTASK "&Vis 16-biter oppgave" IDS_MENU_WINDOWS "&Vinduer" Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -323,6 +323,7 @@ CONTROL "Zapisy We/Wy w bajtach", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "Inne We/Wy", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "Inne We/Wy w bajtach", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Linia poleceÅ", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -418,6 +419,7 @@ IDS_TAB_IOREADBYTES "Odczyty We/Wy w bajtach" IDS_TAB_IOWRITESBYTES "Zapisy We/Wy w bajtach" IDS_TAB_IOOTHERBYTES "Inne We/Wy w bajtach" + IDS_TAB_COMMANDLINE "Linia poleceÅ" IDS_MENU_SELECTCOLUMNS "Wybierz &kolumny..." IDS_MENU_16BITTASK "PokaÅ¼ 16-&bitowe zadania" IDS_MENU_WINDOWS "O&kna" Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "Bytes de gravaÃ§Ã£o de E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 127, 97, 10 CONTROL "Outras E/S", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 138, 47, 10 CONTROL "Outros bytes de E/S", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 149, 77, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 160, 95, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "Bytes de leitura de E/S" IDS_TAB_IOWRITESBYTES "Bytes de gravaÃ§Ã£o de E/S" IDS_TAB_IOOTHERBYTES "Outros Bytes de E/S" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Selecionar colunas..." IDS_MENU_16BITTASK "&Exibir tarefas de 16 bits" IDS_MENU_WINDOWS "&Janelas" Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -321,6 +321,7 @@ CONTROL "In/Ex octeÈi scriÈi", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 127, 110, 10 CONTROL "In/Ex altceva", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 138, 110, 10 CONTROL "In/Ex octeÈi din altceva", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 149, 110, 10 + CONTROL "&Linia de comandÄ", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 160, 65, 10 END /* String Tables */ @@ -416,6 +417,7 @@ IDS_TAB_IOREADBYTES "In/Ex octeÈi citiÈi" IDS_TAB_IOWRITESBYTES "In/Ex octeÈi scriÈi" IDS_TAB_IOOTHERBYTES "In/Ex octeÈi din altceva" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Selectare coloaneâ¦" IDS_MENU_16BITTASK "AfiÈeazÄ activitÄÈi pe 16 &biÈi" IDS_MENU_WINDOWS "F&erestre" Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "ÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð±Ð°Ð¹Ñ", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "ÐÑÐ¾ÑÐ¸Ð¹ Ð²Ð²Ð¾Ð´-Ð²ÑÐ²Ð¾Ð´", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 90, 10 CONTROL "ÐÑÐ¾ÑÐ¸Ñ Ð±Ð°Ð¹Ñ Ð¿ÑÐ¸ Ð²Ð²Ð¾Ð´Ðµ-Ð²ÑÐ²Ð¾Ð´Ðµ", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 122, 10 + CONTROL "ÐÐ¾Ð¼Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 90, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "ÐÑÐ¾ÑÐ¸ÑÐ°Ð½Ð¾ Ð±Ð°Ð¹Ñ" IDS_TAB_IOWRITESBYTES "ÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð±Ð°Ð¹Ñ" IDS_TAB_IOOTHERBYTES "ÐÑÐ¾ÑÐ¸Ñ Ð±Ð°Ð¹Ñ Ð¿ÑÐ¸ Ð²Ð²Ð¾Ð´Ðµ-Ð²ÑÐ²Ð¾Ð´Ðµ" + IDS_TAB_COMMANDLINE "ÐÐ¾Ð¼Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°" IDS_MENU_SELECTCOLUMNS "Ð&ÑÐ±ÑÐ°ÑÑ ÑÑÐ¾Ð»Ð±ÑÑ..." IDS_MENU_16BITTASK "&ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ 16-ÑÐ°Ð·ÑÑÐ´Ð½ÑÐµ Ð·Ð°Ð´Ð°ÑÐ¸" IDS_MENU_WINDOWS "&ÐÐºÐ½Ð°" Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "Vstup a vÃ½stup - zapÃsanÃ© bajty", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 127, 112, 10 CONTROL "Vstup a vÃ½stup - inÃ©", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 138, 77, 10 CONTROL "Vstup a vÃ½stup - inÃ© bajty", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 149, 97, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 130, 160, 95, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "Vstup a vÃ½stup - preÄÃtanÃ© bajty" IDS_TAB_IOWRITESBYTES "Vstup a vÃ½stup - zapÃsanÃ© bajty" IDS_TAB_IOOTHERBYTES "Vstup a vÃ½stup - inÃ© bajty" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&VybraÅ¥ stÄºpce..." IDS_MENU_16BITTASK "&ZobraziÅ¥ 16-bitovÃ© Ãºlohy" IDS_MENU_WINDOWS "&Okna" Modified: trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "Shkruan I/O Bytes", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O te tjere", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O Byte te tjere", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "I/O Lexo Bytes" IDS_TAB_IOWRITESBYTES "I/O Shkruaj Bytes" IDS_TAB_IOOTHERBYTES "I/O te tjere Bytes" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "Zgjidh kolonat..." IDS_MENU_16BITTASK "&Shfaq 16-bit tasks" IDS_MENU_WINDOWS "Dritare" Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -317,6 +317,7 @@ CONTROL "I/O, &antal tecken skrivna", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 133, 127, 113, 10 CONTROL "And&ra I/O Ã¥tgÃ¤rder", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 133, 138, 89, 10 CONTROL "Antal tecken, andra I/O Ã¥tgÃ¤rder", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 133, 149, 141, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 133, 160, 95, 10 END /* String Tables */ @@ -412,6 +413,7 @@ IDS_TAB_IOREADBYTES "Antal tecken lÃ¤sta, andra I/O-Ã¥tgÃ¤rder" IDS_TAB_IOWRITESBYTES "Antal tecken skrivna, andra I/O-Ã¥tgÃ¤rder" IDS_TAB_IOOTHERBYTES "I/O, antal tecken" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&VÃ¤lj kolumner..." IDS_MENU_16BITTASK "&Visa 16-bitsprocesser" IDS_MENU_WINDOWS "&FÃ¶nster" Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "G/Ã Yazma ÃoklularÄ±", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "G/Ã BaÅka", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "G/Ã BaÅka Ãoklular", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "G/Ã Okuma ÃoklularÄ±" IDS_TAB_IOWRITESBYTES "G/Ã Yazma ÃoklularÄ±" IDS_TAB_IOOTHERBYTES "G/Ã BaÅka Ãoklular" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&DikeÃ§leri SeÃ§..." IDS_MENU_16BITTASK "&16 Bitlik GÃ¶revleri GÃ¶ster" IDS_MENU_WINDOWS "&Pencereler" Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -315,6 +315,7 @@ CONTROL "ÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð±Ð°Ð¹ÑÑÐ²", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 67, 10 CONTROL "ÐÐ½ÑÐ¸Ð¹ Ð²Ð²ÑÐ´-Ð²Ð¸Ð²ÑÐ´", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 71, 10 CONTROL "ÐÐ½ÑÐ¸Ñ Ð±Ð°Ð¹ÑÑÐ² Ð¿ÑÐ¸ Ð²Ð²Ð¾Ð´Ñ-Ð²Ð¸Ð²Ð¾Ð´Ñ", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 114, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -410,6 +411,7 @@ IDS_TAB_IOREADBYTES "ÐÑÐ¾ÑÐ¸ÑÐ°Ð½Ð¾ Ð±Ð°Ð¹ÑÑÐ²" IDS_TAB_IOWRITESBYTES "ÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð±Ð°Ð¹ÑÑÐ²" IDS_TAB_IOOTHERBYTES "ÐÐ½ÑÐ¸Ñ Ð±Ð°Ð¹ÑÑÐ² Ð¿ÑÐ´ ÑÐ°Ñ Ð²Ð²Ð¾Ð´Ñ-Ð²Ð¸Ð²Ð¾Ð´Ñ" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "Ð&Ð¸Ð±ÑÐ°ÑÐ¸ ÑÑÐ¾Ð²Ð¿ÑÑ..." IDS_MENU_16BITTASK "&ÐÑÐ´Ð¾Ð±ÑÐ°Ð¶Ð°ÑÐ¸ 16-ÑÐ¾Ð·ÑÑÐ´Ð½Ñ Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ" IDS_MENU_WINDOWS "Ð&ÑÐºÐ½Ð°" Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -321,6 +321,7 @@ CONTROL "I/O åå¥åè", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "I/O å¶ä»", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "I/O å¶ä»åè", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -416,6 +417,7 @@ IDS_TAB_IOREADBYTES "I/O Read Bytes" IDS_TAB_IOWRITESBYTES "I/O Write Bytes" IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "éæ©å(&S)..." IDS_MENU_16BITTASK "æ¾ç¤º 16 ä½ä»»å¡(&S)" IDS_MENU_WINDOWS "çªå£(&W)" Modified: trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -323,6 +323,7 @@ CONTROL "I/O å¯«å¥ä½åçµ", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "å¶ä» I/O", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "å¶ä» I/O ä½åçµ", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 + CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -418,6 +419,7 @@ IDS_TAB_IOREADBYTES "I/O è®åä½åçµ" IDS_TAB_IOWRITESBYTES "I/O å¯«å¥ä½åçµ" IDS_TAB_IOOTHERBYTES "å¶ä» I/O ä½åçµ" + IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "é¸æå(&S)..." IDS_MENU_16BITTASK "é¡¯ç¤º 16 ä½å·¥ä½(&S)" IDS_MENU_WINDOWS "çªå£(&W)" Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -3,7 +3,8 @@ * * perfdata.c * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * Copyright (C) 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,11 +27,12 @@ #include <aclapi.h> #define NTOS_MODE_USER +#include <ndk/psfuncs.h> #include <ndk/exfuncs.h> CRITICAL_SECTION PerfDataCriticalSection; PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ -PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ +PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ ULONG ProcessCountOld = 0; ULONG ProcessCount = 0; double dbIdleTime; @@ -45,6 +47,10 @@ SYSTEM_HANDLE_INFORMATION SystemHandleInfo; PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SystemProcessorTimeInfo = NULL; PSID SystemUserSid = NULL; + +PCMD_LINE_CACHE global_cache = NULL; + +#define CMD_LINE_MIN(a, b) (a < b ? a - sizeof(WCHAR) : b) typedef struct _SIDTOUSERNAME { @@ -371,7 +377,7 @@ pPerfData[Idx].HandleCount = pSPI->HandleCount; pPerfData[Idx].ThreadCount = pSPI->NumberOfThreads; pPerfData[Idx].SessionId = pSPI->SessionId; - pPerfData[Idx].UserName[0] = L'\0'; + pPerfData[Idx].UserName[0] = UNICODE_NULL; pPerfData[Idx].USERObjectCount = 0; pPerfData[Idx].GDIObjectCount = 0; ProcessUser = SystemUserSid; @@ -472,7 +478,7 @@ return (ULONG)dbKernelTime; } -BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount) +BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, ULONG nMaxCount) { BOOL bSuccessful; @@ -504,7 +510,7 @@ return ProcessId; } -BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, int nMaxCount) +BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, ULONG nMaxCount) { BOOL bSuccessful; @@ -522,6 +528,130 @@ return bSuccessful; } +BOOL PerfDataGetCommandLine(ULONG Index, LPWSTR lpCommandLine, ULONG nMaxCount) +{ + static const LPWSTR ellipsis = L"..."; + + PROCESS_BASIC_INFORMATION pbi = {0}; + UNICODE_STRING CommandLineStr = {0}; + + PVOID ProcessParams = NULL; + HANDLE hProcess; + ULONG ProcessId; + + NTSTATUS Status; + BOOL result; + + PCMD_LINE_CACHE new_entry; + LPWSTR new_string; + + PCMD_LINE_CACHE cache = global_cache; + + /* [A] Search for a string already in cache? If so, use it */ + while (cache && cache->pnext != NULL) + { + if (cache->idx == Index && cache->str != NULL) + { + /* Found it. Use it, and add some ellipsis at the very end to make it cute */ + wcsncpy(lpCommandLine, cache->str, CMD_LINE_MIN(nMaxCount, cache->len)); + wcscpy(lpCommandLine + CMD_LINE_MIN(nMaxCount, cache->len) - sizeof(ellipsis)/sizeof(WCHAR), ellipsis); + return TRUE; + } + + cache = cache->pnext; + } + + /* [B] We don't; let's allocate and load a value from the process mem... and cache it */ + ProcessId = PerfDataGetProcessId(Index); + + /* Default blank command line in case things don't work out */ + wcsncpy(lpCommandLine, L"", nMaxCount); + + /* Ask for a handle to the target process so that we can read its memory and query stuff */ + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessId); + if (!hProcess) + goto cleanup; + + /* First off, get the ProcessEnvironmentBlock location in that process' address space */ + Status = NtQueryInformationProcess(hProcess, 0, &pbi, sizeof(pbi), NULL); + if (!NT_SUCCESS(Status)) + goto cleanup; + + /* Then get the PEB.ProcessParameters member pointer */ + result = ReadProcessMemory(hProcess, + (PVOID)((ULONG_PTR)pbi.PebBaseAddress + FIELD_OFFSET(PEB, ProcessParameters)), + &ProcessParams, + sizeof(ProcessParams), + NULL); + if (!result) + goto cleanup; + + /* Then copy the PEB->ProcessParameters.CommandLine member + to get the pointer to the string buffer and its size */ + result = ReadProcessMemory(hProcess, + (PVOID)((ULONG_PTR)ProcessParams + FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, CommandLine)), + &CommandLineStr, + sizeof(CommandLineStr), + NULL); + if (!result) + goto cleanup; + + /* Allocate the next cache entry and its accompanying string in one go */ + new_entry = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(CMD_LINE_CACHE) + CommandLineStr.Length + sizeof(UNICODE_NULL)); + if (!new_entry) + goto cleanup; + + new_string = (LPWSTR)((ULONG_PTR)new_entry + sizeof(CMD_LINE_CACHE)); + + /* Bingo, the command line should be stored there, + copy the string from the other process */ + result = ReadProcessMemory(hProcess, + CommandLineStr.Buffer, + new_string, + CommandLineStr.Length, + NULL); + if (!result) + { + /* Weird, after sucessfully reading the mem of that process + various times it fails now, forget it and bail out */ + HeapFree(GetProcessHeap(), 0, new_entry); + goto cleanup; + } + + /* Add our pointer to the cache... */ + new_entry->idx = Index; + new_entry->str = new_string; + new_entry->len = CommandLineStr.Length; + + if (!global_cache) + global_cache = new_entry; + else + cache->pnext = new_entry; + + /* ... and print the buffer for the first time */ + wcsncpy(lpCommandLine, new_string, CMD_LINE_MIN(nMaxCount, CommandLineStr.Length)); + +cleanup: + if (hProcess) CloseHandle(hProcess); + return TRUE; +} + +void PerfDataDeallocCommandLineCache() +{ + PCMD_LINE_CACHE cache = global_cache; + PCMD_LINE_CACHE cache_old; + + while (cache && cache->pnext != NULL) + { + cache_old = cache; + cache = cache->pnext; + + HeapFree(GetProcessHeap(), 0, cache_old); + } +} + ULONG PerfDataGetSessionId(ULONG Index) { ULONG SessionId; Modified: trunk/reactos/base/applications/taskmgr/perfdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.h [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -55,19 +55,31 @@ LARGE_INTEGER KernelTime; } PERFDATA, *PPERFDATA; +typedef struct _CMD_LINE_CACHE +{ + DWORD idx; + LPWSTR str; + ULONG len; + struct _CMD_LINE_CACHE* pnext; +} CMD_LINE_CACHE, *PCMD_LINE_CACHE; + BOOL PerfDataInitialize(void); void PerfDataUninitialize(void); void PerfDataRefresh(void); -BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData); -ULONG PerfDataGetProcessIndex(ULONG pid); +BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData); +ULONG PerfDataGetProcessIndex(ULONG pid); ULONG PerfDataGetProcessCount(void); ULONG PerfDataGetProcessorUsage(void); ULONG PerfDataGetProcessorSystemUsage(void); -BOOL PerfDataGetImageName(ULONG Index, LPTSTR lpImageName, int nMaxCount); +BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, ULONG nMaxCount); ULONG PerfDataGetProcessId(ULONG Index); -BOOL PerfDataGetUserName(ULONG Index, LPTSTR lpUserName, int nMaxCount); +BOOL PerfDataGetUserName(ULONG Index, LPWSTR lpUserName, ULONG nMaxCount); + +BOOL PerfDataGetCommandLine(ULONG Index, LPWSTR lpCommandLine, ULONG nMaxCount); +void PerfDataDeallocCommandLineCache(); + ULONG PerfDataGetSessionId(ULONG Index); ULONG PerfDataGetCPUUsage(ULONG Index); LARGE_INTEGER PerfDataGetCPUTime(ULONG Index); Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -52,9 +52,9 @@ void UpdateProcesses(); void gethmsfromlargeint(LARGE_INTEGER largeint, DWORD *dwHours, DWORD *dwMinutes, DWORD *dwSeconds); void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam); -void CommaSeparateNumberString(LPWSTR strNumber, int nMaxCount); +void CommaSeparateNumberString(LPWSTR strNumber, ULONG nMaxCount); void ProcessPageShowContextMenu(DWORD dwProcessId); -BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount); +BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, ULONG nMaxCount); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); int ProcessRunning(ULONG ProcessId); @@ -245,7 +245,7 @@ Index = PerfDataGetProcessIndex(pData->ProcessId); ColumnIndex = pnmdi->item.iSubItem; - PerfDataGetText(Index, ColumnIndex, pnmdi->item.pszText, pnmdi->item.cchTextMax); + PerfDataGetText(Index, ColumnIndex, pnmdi->item.pszText, (ULONG)pnmdi->item.cchTextMax); break; @@ -290,7 +290,7 @@ } } -void CommaSeparateNumberString(LPWSTR strNumber, int nMaxCount) +void CommaSeparateNumberString(LPWSTR strNumber, ULONG nMaxCount) { WCHAR temp[260]; UINT i, j, k; @@ -530,7 +530,7 @@ } } -BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount) +BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, ULONG nMaxCount) { IO_COUNTERS iocounters; LARGE_INTEGER time; @@ -541,6 +541,8 @@ wsprintfW(lpText, L"%lu", PerfDataGetProcessId(Index)); if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) PerfDataGetUserName(Index, lpText, nMaxCount); + if (ColumnDataHints[ColumnIndex] == COLUMN_COMMANDLINE) + PerfDataGetCommandLine(Index, lpText, nMaxCount); if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) wsprintfW(lpText, L"%lu", PerfDataGetSessionId(Index)); if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) @@ -753,6 +755,12 @@ PerfDataGetUserName(IndexParam2, text2, sizeof (text2) / sizeof (*text2)); ret = _wcsicmp(text1, text2); } + else if (TaskManagerSettings.SortColumn == COLUMN_COMMANDLINE) + { + PerfDataGetCommandLine(IndexParam1, text1, sizeof (text1) / sizeof (*text1)); + PerfDataGetCommandLine(IndexParam2, text2, sizeof (text2) / sizeof (*text2)); + ret = _wcsicmp(text1, text2); + } else if (TaskManagerSettings.SortColumn == COLUMN_SESSIONID) { l1 = PerfDataGetSessionId(IndexParam1); Modified: trunk/reactos/base/applications/taskmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -113,6 +113,7 @@ #define IDC_IOOTHERBYTES 1047 #define IDC_CPU_USAGE_GRAPH 1047 #define IDC_CPU29 1048 +#define IDC_COMMANDLINE 1048 #define IDC_MEM_USAGE_GRAPH2 1048 #define IDC_MEM_USAGE_GRAPH 1048 #define IDC_CPU30 1049 @@ -222,6 +223,7 @@ #define IDS_TAB_IOREADBYTES 337 #define IDS_TAB_IOWRITESBYTES 338 #define IDS_TAB_IOOTHERBYTES 339 +#define IDS_TAB_COMMANDLINE 368 #define IDS_MENU_SELECTCOLUMNS 340 #define IDS_MENU_16BITTASK 341 Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Sun Nov 23 20:10:15 2014 @@ -480,6 +480,8 @@ TaskManagerSettings.Maximized = TRUE; else TaskManagerSettings.Maximized = FALSE; + /* Get rid of the allocated command line cache, if any */ + PerfDataDeallocCommandLineCache(); return DefWindowProcW(hDlg, message, wParam, lParam); case WM_TIMER: @@ -1140,7 +1142,7 @@ DWORD dwRet; LPWSTR lpszTemp = NULL; - dwRet = FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |FORMAT_MESSAGE_ARGUMENT_ARRAY, + dwRet = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, NULL, GetLastError(), LANG_NEUTRAL,

10 years, 1 month

[pschweitzer] 65468: [NTFS] - Implement NtfsGetPositionInformation(), NtfsGetBasicInformation() - Add a fixme in NtfsGetStandardInformation() regarding the number of links

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 23 19:53:16 2014 New Revision: 65468 URL: http://svn.reactos.org/svn/reactos?rev=65468&view=rev Log: [NTFS] - Implement NtfsGetPositionInformation(), NtfsGetBasicInformation() - Add a fixme in NtfsGetStandardInformation() regarding the number of links Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun Nov 23 19:53:16 2014 @@ -59,7 +59,7 @@ StandardInfo->AllocationSize = Fcb->RFCB.AllocationSize; StandardInfo->EndOfFile = Fcb->RFCB.FileSize; - StandardInfo->NumberOfLinks = 0; + StandardInfo->NumberOfLinks = 0; /* FIXME */ StandardInfo->DeletePending = FALSE; StandardInfo->Directory = NtfsFCBIsDirectory(Fcb); @@ -75,15 +75,12 @@ PFILE_POSITION_INFORMATION PositionInfo, PULONG BufferLength) { - UNREFERENCED_PARAMETER(FileObject); - DPRINT("NtfsGetPositionInformation() called\n"); if (*BufferLength < sizeof(FILE_POSITION_INFORMATION)) return STATUS_BUFFER_OVERFLOW; - PositionInfo->CurrentByteOffset.QuadPart = 0; -// FileObject->CurrentByteOffset.QuadPart; + PositionInfo->CurrentByteOffset.QuadPart = FileObject->CurrentByteOffset.QuadPart; DPRINT("Getting position %I64x\n", PositionInfo->CurrentByteOffset.QuadPart); @@ -102,29 +99,19 @@ PFILE_BASIC_INFORMATION BasicInfo, PULONG BufferLength) { + PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; + DPRINT("NtfsGetBasicInformation() called\n"); if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_OVERFLOW; -#if 0 - CdfsDateTimeToFileTime(Fcb, - &BasicInfo->CreationTime); - CdfsDateTimeToFileTime(Fcb, - &BasicInfo->LastAccessTime); - CdfsDateTimeToFileTime(Fcb, - &BasicInfo->LastWriteTime); - CdfsDateTimeToFileTime(Fcb, - &BasicInfo->ChangeTime); - - CdfsFileFlagsToAttributes(Fcb, - &BasicInfo->FileAttributes); -#else - UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(Fcb); - UNREFERENCED_PARAMETER(DeviceObject); - UNREFERENCED_PARAMETER(BasicInfo); -#endif + BasicInfo->CreationTime.QuadPart = FileName->CreationTime; + BasicInfo->LastAccessTime.QuadPart = FileName->LastAccessTime; + BasicInfo->LastWriteTime.QuadPart = FileName->LastWriteTime; + BasicInfo->ChangeTime.QuadPart = FileName->ChangeTime; + + NtfsFileFlagsToAttributes(FileName->FileAttributes, &BasicInfo->FileAttributes); *BufferLength -= sizeof(FILE_BASIC_INFORMATION);

10 years, 1 month

[hbelusca] 65467: Fixup a potential division by zero (that happens anyway in my tests).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 23 19:16:41 2014 New Revision: 65467 URL: http://svn.reactos.org/svn/reactos?rev=65467&view=rev Log: Fixup a potential division by zero (that happens anyway in my tests). Modified: trunk/reactos/base/applications/taskmgr/perfpage.c Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] Sun Nov 23 19:16:41 2014 @@ -374,7 +374,7 @@ sizeof(szChargeLimitFormat)); wsprintfW(Text, szMemUsage, szChargeTotalFormat, szChargeLimitFormat, - (UINT)((CommitChargeTotal * 100) / CommitChargeLimit)); + (CommitChargeLimit ? ((CommitChargeTotal * 100) / CommitChargeLimit) : 0)); SendMessageW(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text);

10 years, 1 month

[hbelusca] 65466: [TASKMGR] Improve formatting memory size usage in the status bar of Task Manager. Patch by Ismael Ferreras Morezuelas (swyter). CORE-8810 #resolve #comment Committed in r65466, th...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 23 18:36:25 2014 New Revision: 65466 URL: http://svn.reactos.org/svn/reactos?rev=65466&view=rev Log: [TASKMGR] Improve formatting memory size usage in the status bar of Task Manager. Patch by Ismael Ferreras Morezuelas (swyter). CORE-8810 #resolve #comment Committed in r65466, thanks d:^D Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/he-IL.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc trunk/reactos/base/applications/taskmgr/perfpage.c Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -23,6 +23,6 @@ add_executable(taskmgr ${SOURCE} taskmgr.rc) set_module_type(taskmgr win32gui UNICODE) -add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll) +add_importlibs(taskmgr advapi32 user32 gdi32 shell32 shlwapi comctl32 msvcrt kernel32 ntdll) add_pch(taskmgr precomp.h SOURCE) add_cd_file(TARGET taskmgr DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "ÐÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¼Ð°Ð»ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÑÐ²ÐµÐ½ÑÑÐ²Ð¾" IDS_MSG_WARNINGCHANGEPRIORITY "ÐÐÐÐÐÐÐÐ: ÐÑÐ¾Ð¼ÑÐ½Ð°ÑÐ° Ð½Ð° Ð¿ÑÑÐ²ÐµÐ½ÑÑÐ²Ð¾ÑÐ¾ Ð½Ð° ÑÐ¾Ð²Ð° Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð°\nÐ¿ÑÐ¸ÑÐ¸Ð½Ð¸ Ð½ÐµÐ¶ÐµÐ»Ð°Ð½Ð¸ Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑÐ²Ð¸Ñ, Ð²ÐºÐ»ÑÑÐ¸ÑÐµÐ»Ð½Ð¾ Ð½ÐµÑÑÑÐ¾Ð¹ÑÐ¸Ð²Ð¾ÑÑ Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°. Ð¡Ð¸Ð³ÑÑÐµÐ½ Ð»Ð¸ ÑÑÐµ, \nÑÐµ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° ÑÐ¼ÐµÐ½Ð¸ÑÐµ ÑÑÐ°ÑÑÐ¸Ð½ÑÑÐ²Ð¾ÑÐ¾?" IDS_MSG_TRAYICONCPUUSAGE "ÐÐ°ÐµÑÐ¾ÑÑ Ð½Ð° Ð¦ÐÐ£: %d%%" - IDS_STATUS_MEMUSAGE "ÐÐ°ÐµÑÐ° Ð¿Ð°Ð¼ÐµÑ: %dK / %dK" + IDS_STATUS_MEMUSAGE "ÐÐ°ÐµÑÐ° Ð¿Ð°Ð¼ÐµÑ: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "ÐÐ°ÐµÑÐ¾ÑÑ Ð½Ð° Ð¦ÐÐ£: %3d%%" IDS_STATUS_PROCESSES "ÐÐµÐ¹ÑÑÐ²Ð¸Ñ: %d" IDS_NOT_RESPONDING "ÐÐµ Ð¾ÑÐ³Ð¾Ð²Ð°ÑÑ" Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "NenÃ moÅ¾nÃ© zmÄnit prioritu" IDS_MSG_WARNINGCHANGEPRIORITY "UpozornÄnÃ: ZmÄna priority procesu mÅ¯Å¾e\nzpÅ¯sobit nestabilitu systÃ©mu a jinÃ© nepÅedvÃdatelnÃ© problÃ©my. Jste si jisti\nse zmÄnou priority procesu?" IDS_MSG_TRAYICONCPUUSAGE "VyuÅ¾itÃ CPU: %d%%" - IDS_STATUS_MEMUSAGE "VyuÅ¾itÃ pamÄti: %dK / %dK" + IDS_STATUS_MEMUSAGE "VyuÅ¾itÃ pamÄti: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "VyuÅ¾itÃ CPU: %3d%%" IDS_STATUS_PROCESSES "Procesy: %d" IDS_NOT_RESPONDING "NeodpovÃdÃ¡" Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" - IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" + IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding" Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Kann die PrioritÃ¤t nicht Ã¤ndern" IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das Ãndern der PrioritÃ¤tsklasse dieses Prozesses\nkann zu unerwÃ¼nschten Ergebnissen, einschl. SysteminstabilitÃ¤t, fÃ¼hren.\nSind Sie sicher, dass Sie sie Ã¤ndern mÃ¶chten?" IDS_MSG_TRAYICONCPUUSAGE "CPU-Auslastung: %d%%" - IDS_STATUS_MEMUSAGE "zugesicherter Speicher: %dK / %dK" + IDS_STATUS_MEMUSAGE "zugesicherter Speicher: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU-Auslastung: %3d%%" IDS_STATUS_PROCESSES "Prozesse: %d" IDS_NOT_RESPONDING "Keine RÃ¼ckmeldung" Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" - IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" + IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding" Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -431,7 +431,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" - IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" + IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding" Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "No se pudo cambiar la prioridad" IDS_MSG_WARNINGCHANGEPRIORITY "Advertencia: El cambio de prioridad en ciertos procesos podrÃa provocar la inestabilidad del sistema.\nÂ¿Seguro que desea cambiar la prioridad?" IDS_MSG_TRAYICONCPUUSAGE "Promedio CPU: %d%%" - IDS_STATUS_MEMUSAGE "Uso de memoria: %dK / %dK" + IDS_STATUS_MEMUSAGE "Uso de memoria: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Uso de CPU: %3d%%" IDS_STATUS_PROCESSES "Procesos: %d" IDS_NOT_RESPONDING "No responde" Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Impossible de changer la prioritÃ©" IDS_MSG_WARNINGCHANGEPRIORITY "ATTENTION : Changer la prioritÃ© du processus peut causer des\neffets indÃ©sirables comme l'instabilitÃ© du systÃ¨me.\nÃtes-vous sÃ»r de vouloir changer la prioritÃ© ?" IDS_MSG_TRAYICONCPUUSAGE "UC utilisÃ©e : %d%%" - IDS_STATUS_MEMUSAGE "Fichier d'Ã©change utilisÃ© : %dK / %dK" + IDS_STATUS_MEMUSAGE "Fichier d'Ã©change utilisÃ© : %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "UC utilisÃ©e : %3d%%" IDS_STATUS_PROCESSES "Processus : %d" IDS_NOT_RESPONDING "Ne rÃ©pond pas" Modified: trunk/reactos/base/applications/taskmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" - IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" + IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding" Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Nem lehetsÃ©ges a prioritÃ¡s megvÃ¡ltoztatÃ¡sa" IDS_MSG_WARNINGCHANGEPRIORITY "FIGYELEM: A prioritÃ¡s megvÃ¡ltoztatÃ¡sa\nkellemetlensÃ©geket, akÃ¡r rendszer instabilitÃ¡st is okozhat.\nBiztosan megakarod vÃ¡ltoztatni a prioritÃ¡st?" IDS_MSG_TRAYICONCPUUSAGE "CPU hasznÃ¡lat: %d%%" - IDS_STATUS_MEMUSAGE "Mem hasznÃ¡lat: %dK / %dK" + IDS_STATUS_MEMUSAGE "Mem hasznÃ¡lat: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU hasznÃ¡lat: %3d%%" IDS_STATUS_PROCESSES "Folyamatok: %d" IDS_NOT_RESPONDING "Nem vÃ¡laszol" Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "Pemakaian CPU: %d%%" - IDS_STATUS_MEMUSAGE "Pemakaian Mem: %dK / %dK" + IDS_STATUS_MEMUSAGE "Pemakaian Mem: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Pemakaian CPU: %3d%%" IDS_STATUS_PROCESSES "Proses: %d" IDS_NOT_RESPONDING "Tidak Merespon" Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Impossibile cambiare la PrioritÃ " IDS_MSG_WARNINGCHANGEPRIORITY "ATTENZIONE: La modifica della classe di prioritÃ puÃ² provocare\n effetti indesiderati compresa la perdita di dati o l'instabilitÃ del sistema.\nSei sicuro di voler procedere?" IDS_MSG_TRAYICONCPUUSAGE "Uso CPU: %d%%" - IDS_STATUS_MEMUSAGE "Uso Mem: %dK / %dK" + IDS_STATUS_MEMUSAGE "Uso Mem: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Uso CPU: %3d%%" IDS_STATUS_PROCESSES "Processi: %d" IDS_NOT_RESPONDING "Non risponde" Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "åªååº¦ãå¤æ´ã§ãã¾ãã" IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: ãã®ããã»ã¹ã®åªååº¦ã¯ã©ã¹ãå¤æ´ããã¨ãã·ã¹ãã ãä¸å®å®ã«\nãªããªã©ãäºæããªãçµæã«ãªããã¨ãããã¾ãã\nåªååº¦ã¯ã©ã¹ãå¤æ´ãã¾ãã?" IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨ç: %d%%" - IDS_STATUS_MEMUSAGE "ã¡ã¢ãªä½¿ç¨é: %dKB / %dKB" + IDS_STATUS_MEMUSAGE "ã¡ã¢ãªä½¿ç¨é: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU ä½¿ç¨ç: %3d%%" IDS_STATUS_PROCESSES "ããã»ã¹: %d" IDS_NOT_RESPONDING "å¿çãªã" Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "ì°ì ììë¥¼ ë°ê¿ ì ìì" IDS_MSG_WARNINGCHANGEPRIORITY "ê²½ê³ : ì´ íë¡ì¸ì¤ì ì°ì ìì í´ëì¤ë¥¼ ë³ê²½íë©´ ìì¤í ë¶ìì ì í¬í¨íì¬\nìê¸°ì¹ ìì ê²°ê³¼ë¥¼ ì´ëí ìë ììµëë¤.\nì°ì ìì í´ëì¤ë¥¼ ë³ê²½íìê² ìµëê¹?" IDS_MSG_TRAYICONCPUUSAGE "CPU ì¬ì©: %d%%" - IDS_STATUS_MEMUSAGE "ë©ëª¨ë¦¬ ì¬ì©: %dK / %dK" + IDS_STATUS_MEMUSAGE "ë©ëª¨ë¦¬ ì¬ì©: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU ì¬ì©: %3d%%" IDS_STATUS_PROCESSES "íë¡ì¸ì¤: %d" IDS_NOT_RESPONDING "ìëµ ìì" Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Kan de prioriteit niet wijzigen" IDS_MSG_WARNINGCHANGEPRIORITY "Waarschuwing: het wijzigen van de prioriteitsklasse van dit proces\nkan ongewenste resultaten hebben, zoals een instabiel systeem. Weet u\nzeker dat u de prioriteitsklasse wilt wijzigen?" IDS_MSG_TRAYICONCPUUSAGE "CPU-gebruik: %d%%" - IDS_STATUS_MEMUSAGE "Geheugengebruik: %dK / %dK" + IDS_STATUS_MEMUSAGE "Geheugengebruik: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU-gebruik: %3d%%" IDS_STATUS_PROCESSES "Processen: %d" IDS_NOT_RESPONDING "Reageert niet" Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Ikke i stand til endre prioritet" IDS_MSG_WARNINGCHANGEPRIORITY "ADVARSEL: Endring av prioritet klasse av denne prosess kan\nforutsake uÃ¸nsket resultat inkluderer systemet kan bli ustabilt. Er du\nsikker pÃ¥ at du vil endre prioritet klassen?" IDS_MSG_TRAYICONCPUUSAGE "Prosessorbruk: %d%%" - IDS_STATUS_MEMUSAGE "Tildelt minne: %dK / %dK" + IDS_STATUS_MEMUSAGE "Tildelt minne: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Prosessorbruk: %3d%%" IDS_STATUS_PROCESSES "Prosesser: %d" IDS_NOT_RESPONDING "Ingen reaksjon" Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -441,7 +441,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Nie moÅ¼na zmieniÄ priorytetu" IDS_MSG_WARNINGCHANGEPRIORITY "UWAGA: Zmiana priorytetu tego procesu moÅ¼e przynieÅÄ\nniepoÅ¼Ädane skutki, w tym rÃ³wnieÅ¼ niestabilnoÅÄ systemu.\nCzy na pewno chcesz zmieni priorytet?" IDS_MSG_TRAYICONCPUUSAGE "UÅ¼ycie procesora: %d%%" - IDS_STATUS_MEMUSAGE "Pam. zadeklar.: %dK / %dK" + IDS_STATUS_MEMUSAGE "Pam. zadeklar.: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "UÅ¼ycie procesora: %3d%%" IDS_STATUS_PROCESSES "Procesy: %d" IDS_NOT_RESPONDING "Nie odpowiada" Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "NÃ£o Ã© possÃvel alterar a prioridade" IDS_MSG_WARNINGCHANGEPRIORITY "AVISO: a alteraÃ§Ã£o da classe de prioridade do processo\npode causar efeitos indesejÃ¡veis, inclusive a instabilidade do sistema. Tem\ncerteza de que deseja alterar a classe de prioridade?" IDS_MSG_TRAYICONCPUUSAGE "Uso de CPU: %d%%" - IDS_STATUS_MEMUSAGE "Uso de MemÃ³ria: %dK / %dK" + IDS_STATUS_MEMUSAGE "Uso de MemÃ³ria: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Uso de CPU: %3d%%" IDS_STATUS_PROCESSES "Processo: %d" IDS_NOT_RESPONDING "NÃ£o respondendo" Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -439,7 +439,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Nu se poate schimba prioritatea" IDS_MSG_WARNINGCHANGEPRIORITY "Schimbarea prioritÄÈii poate duce la efecte colaterale\nprecum instabilitatea sistemului.\nSigur doriÈi schimbarea prioritÄÈii procesului?" IDS_MSG_TRAYICONCPUUSAGE "Utilizare procesor: %d%%" - IDS_STATUS_MEMUSAGE "Utilizare memorie: %dko/%dko" + IDS_STATUS_MEMUSAGE "Utilizare memorie: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Utilizare procesor: %3d%%" IDS_STATUS_PROCESSES "Procese: %d" IDS_NOT_RESPONDING "EXECUÈIE ANORMALÄ" Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑ" IDS_MSG_WARNINGCHANGEPRIORITY "ÐÐÐÐÐÐÐÐ: ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑÐ° ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð½ÐµÐ¶ÐµÐ»Ð°ÑÐµÐ»ÑÐ½ÑÐ¼ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÐ°Ð¼, Ð² ÑÐ¾Ð¼ ÑÐ¸ÑÐ»Ðµ Ðº Ð½ÐµÑÑÐ°Ð±Ð¸Ð»ÑÐ½Ð¾Ð¹ ÑÐ°Ð±Ð¾ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.\nÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ»Ð°ÑÑ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑÐ°?" IDS_MSG_TRAYICONCPUUSAGE "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¦Ð: %d%%" - IDS_STATUS_MEMUSAGE "ÐÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð¼ÑÑÐ¸: %dK / %dK" + IDS_STATUS_MEMUSAGE "ÐÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð¼ÑÑÐ¸: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¦Ð: %3d%%" IDS_STATUS_PROCESSES "ÐÑÐ¾ÑÐµÑÑÐ¾Ð²: %d" IDS_NOT_RESPONDING "ÐÐµ Ð¾ÑÐ²ÐµÑÐ°ÐµÑ" Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Priorita sa nedÃ¡ zmeniÅ¥." IDS_MSG_WARNINGCHANGEPRIORITY "UPOZORNENIE: Zmena triedy priority procesu mÃ´Å¾e maÅ¥\nneÅ¾iadÃºce dÃ´sledky vrÃ¡tane nestability systÃ©mu.\nNaozaj chcete zmeniÅ¥ triedu priority procesu?" IDS_MSG_TRAYICONCPUUSAGE "VyuÅ¾itie procesora: %d%%" - IDS_STATUS_MEMUSAGE "VyuÅ¾itÃ¡ pamÃ¤Å¥: %dK / %dK" + IDS_STATUS_MEMUSAGE "VyuÅ¾itÃ¡ pamÃ¤Å¥: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "VyuÅ¾itie procesora: %3d%%" IDS_STATUS_PROCESSES "Procesy: %d" IDS_NOT_RESPONDING "NeodpovedÃ¡" Modified: trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "E pamundur ndryshimi i prioritetit" IDS_MSG_WARNINGCHANGEPRIORITY "KUJDES: Ndryshimi i klases se prioritetit te ketij procesi mund te \nsjell rrezultate te padeshirushme ne stabilitetin e sistemit. Jeni i sigurt\nper ndryshimin e klases se prioriteteve?" IDS_MSG_TRAYICONCPUUSAGE "Perdorimi i CPU: %d%%" - IDS_STATUS_MEMUSAGE "Perdorimi i Mem: %dK / %dK" + IDS_STATUS_MEMUSAGE "Perdorimi i Mem: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Perdorimi i CPU: %3d%%" IDS_STATUS_PROCESSES "Proceset: %d" IDS_NOT_RESPONDING "Nuk pergjigjet" Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -435,7 +435,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Kunde inte Ã¤ndra prioritet" IDS_MSG_WARNINGCHANGEPRIORITY "VARNING: Ãndring av prioritetsklassen hos den hÃ¤r processen kan\norsaka oÃ¶nskade effekter och pÃ¥verka systemets stabilitet. Ãr du\nsÃ¤ker pÃ¥ att du vill Ã¤ndra prioritetsklassen?" IDS_MSG_TRAYICONCPUUSAGE "ProcessoranvÃ¤ndning: %d%%" - IDS_STATUS_MEMUSAGE "Minnesanv: %dK / %dK" + IDS_STATUS_MEMUSAGE "Minnesanv: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Processoranv: %3d%%" IDS_STATUS_PROCESSES "Processer: %d" IDS_NOT_RESPONDING "Svarar inte" Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "ÃnceliÄin DeÄiÅtirilememesi" IDS_MSG_WARNINGCHANGEPRIORITY "UYARI: Bu iÅlemin Ã¶ncelik sÄ±nÄ±fÄ±nÄ±n deÄiÅtirilmesi, dizge\nkararsÄ±zlÄ±ÄÄ±nÄ± iÃ§eren istenmeyen sonuÃ§lara neden olabilir. Ãncelik \nsÄ±nÄ±fÄ±nÄ± deÄiÅtirmek istediÄinizden emin misiniz?" IDS_MSG_TRAYICONCPUUSAGE "CPU KullanÄ±mÄ±: %%%d" - IDS_STATUS_MEMUSAGE "Bellek KullanÄ±mÄ±: %d KB / %d KB" + IDS_STATUS_MEMUSAGE "Bellek KullanÄ±mÄ±: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU KullanÄ±mÄ±: %%%3d" IDS_STATUS_PROCESSES "Ä°Ålem: %d" IDS_NOT_RESPONDING "YanÄ±t Vermiyor" Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -433,7 +433,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ Ð¿ÑÑÐ¾ÑÐ¸ÑÐµÑ" IDS_MSG_WARNINGCHANGEPRIORITY "Ð£ÐÐÐÐ! ÐÐ¼ÑÐ½Ð° ÐºÐ»Ð°ÑÑ Ð¿ÑÑÐ¾ÑÐ¸ÑÐµÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐµÑÑ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐ¸Ð·Ð²ÐµÑÑÐ¸ Ð´Ð¾ \nÐ½ÐµÐ±Ð°Ð¶Ð°Ð½Ð¸Ñ Ð½Ð°ÑÐ»ÑÐ´ÐºÑÐ², Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸ Ð½ÐµÑÑÐ°Ð±ÑÐ»ÑÐ½Ñ ÑÐ¾Ð±Ð¾ÑÑ \nÑÐ¸ÑÑÐµÐ¼Ð¸. ÐÐ¸ Ð´ÑÐ¹ÑÐ½Ð¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ Ð¿ÑÑÐ¾ÑÐ¸ÑÐµÑ ÐºÐ»Ð°ÑÑ?" IDS_MSG_TRAYICONCPUUSAGE "ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ Ð¦Ð: %d%%" - IDS_STATUS_MEMUSAGE "ÐÐ°Ð¼'ÑÑÑ: %dK / %dK" + IDS_STATUS_MEMUSAGE "ÐÐ°Ð¼'ÑÑÑ: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ Ð¦Ð: %3d%%" IDS_STATUS_PROCESSES "ÐÑÐ¾ÑÐµÑÑÐ²: %d" IDS_NOT_RESPONDING "ÐÐµ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ð°Ñ" Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -439,7 +439,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨æåµ: %d%%" - IDS_STATUS_MEMUSAGE "ååä½¿ç¨æåµ: %dK / %dK" + IDS_STATUS_MEMUSAGE "ååä½¿ç¨æåµ: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU ä½¿ç¨æåµ: %3d%%" IDS_STATUS_PROCESSES "èçç¨åº: %d" IDS_NOT_RESPONDING "æ²¡æååº" Modified: trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -441,7 +441,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "ç¡æ³æ´æ¹åªåé åº" IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: æ´æ¹æ¤ç¨åºçåªåé åºå¯è½å°è´ç³»çµ±ä¸ç©©å®ã\nä½ æ¯å¦ç¢ºå®è¦æ´æ¹åªåé åºï¼" IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨ææ³: %d%%" - IDS_STATUS_MEMUSAGE "è¨æ¶é«ä½¿ç¨ææ³: %dK / %dK" + IDS_STATUS_MEMUSAGE "è¨æ¶é«ä½¿ç¨ææ³: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU ä½¿ç¨ææ³: %3d%%" IDS_STATUS_PROCESSES "èçç¨åº: %d" IDS_NOT_RESPONDING "æ²æåæ" Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] Sun Nov 23 18:36:25 2014 @@ -21,6 +21,7 @@ */ #include "precomp.h" +#include <shlwapi.h> TGraphCtrl PerformancePageCpuUsageHistoryGraph; TGraphCtrl PerformancePageMemUsageHistoryGraph; @@ -311,20 +312,20 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) { - ULONG CommitChargeTotal; - ULONG CommitChargeLimit; - ULONG CommitChargePeak; + ULONGLONG CommitChargeTotal; + ULONGLONG CommitChargeLimit; + ULONGLONG CommitChargePeak; ULONG CpuUsage; ULONG CpuKernelUsage; - ULONG KernelMemoryTotal; - ULONG KernelMemoryPaged; - ULONG KernelMemoryNonPaged; - - ULONG PhysicalMemoryTotal; - ULONG PhysicalMemoryAvailable; - ULONG PhysicalMemorySystemCache; + ULONGLONG KernelMemoryTotal; + ULONGLONG KernelMemoryPaged; + ULONGLONG KernelMemoryNonPaged; + + ULONGLONG PhysicalMemoryTotal; + ULONGLONG PhysicalMemoryAvailable; + ULONGLONG PhysicalMemorySystemCache; ULONG TotalHandles; ULONG TotalThreads; @@ -342,6 +343,9 @@ int nBarsUsed1; int nBarsUsed2; + WCHAR szChargeTotalFormat[256]; + WCHAR szChargeLimitFormat[256]; + /* Wait for an the event or application close */ if (GetMessage(&msg, NULL, 0, 0) <= 0) return 0; @@ -353,14 +357,25 @@ */ CommitChargeTotal = PerfDataGetCommitChargeTotalK(); CommitChargeLimit = PerfDataGetCommitChargeLimitK(); - CommitChargePeak = PerfDataGetCommitChargePeakK(); + CommitChargePeak = PerfDataGetCommitChargePeakK(); _ultow(CommitChargeTotal, Text, 10); SetWindowTextW(hPerformancePageCommitChargeTotalEdit, Text); _ultow(CommitChargeLimit, Text, 10); SetWindowTextW(hPerformancePageCommitChargeLimitEdit, Text); _ultow(CommitChargePeak, Text, 10); SetWindowTextW(hPerformancePageCommitChargePeakEdit, Text); - wsprintfW(Text, szMemUsage, CommitChargeTotal, CommitChargeLimit); + + StrFormatByteSizeW(CommitChargeTotal * 1024, + szChargeTotalFormat, + sizeof(szChargeTotalFormat)); + + StrFormatByteSizeW(CommitChargeLimit * 1024, + szChargeLimitFormat, + sizeof(szChargeLimitFormat)); + + wsprintfW(Text, szMemUsage, szChargeTotalFormat, szChargeLimitFormat, + (UINT)((CommitChargeTotal * 100) / CommitChargeLimit)); + SendMessageW(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text); /*

10 years, 1 month

← Newer
1
...
4
5
6
7
8
9
10
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2014