Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.11][TASKMGR] Backport commits id-ID and 'Remove Debug Channels' CORE-18057

Browse source 
by picking the following commits:
0.4.15-dev-413-g ed7196d964 [TASKMGR] Remove 'Debug Channels' feature, which is Wine-specific
0.4.15-dev-2488-g fd4d8f550c [TASKMGR] id-ID.rc, just the single line in this module
This commit is contained in:
Joachim Henze 2022-02-27 22:48:32 +01:00
parent 488d320a42
commit 2f9b2df3d0
35 changed files with 7 additions and 430 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
base/applications/taskmgr/CMakeLists.txt
View file

@ -4,7 +4,6 @@ list(APPEND SOURCE
affinity.c
applpage.c
column.c
dbgchnl.c
debug.c
endproc.c
graph.c

384
base/applications/taskmgr/dbgchnl.c
View file

@ -1,384 +0,0 @@
/*
* ReactOS Task Manager
*
* dbgchnl.c
*
* Copyright (C) 2003 - 2004 Eric Pouech
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "precomp.h"
#include <stdio.h>
/* TODO:
* - the dialog box could be non modal
* - in that case,
* + could refresh channels from time to time
* - get a better UI (replace the 'x' by real tick boxes in list view)
* - implement a real solution around the get_symbol hack
* - enhance visual feedback: the list is large, and it's hard to get the
* right line when clicking on rightmost column (trace for example)
* - get rid of printfs (error reporting) and use real message boxes
* - include the column width settings in the full column management scheme
*/
BOOL DebugChannelsAreSupported(void)
{
#ifdef WINE
return TRUE;
#endif
return FALSE;
}
static int list_channel_CB(HANDLE hProcess, void* addr, WCHAR* buffer, void* user)
{
int j;
WCHAR val[2];
LVITEM lvi;
int index;
HWND hChannelLV = (HWND)user;
memset(&lvi, 0, sizeof(lvi));
lvi.mask = LVIF_TEXT;
lvi.pszText = buffer + 1;
index = ListView_InsertItem(hChannelLV, &lvi);
if (index == -1) return 0;
val[1] = L'\0';
for (j = 0; j < 4; j++)
{
val[0] = (buffer[0] & (1 << j)) ? L'x' : L' ';
ListView_SetItemText(hChannelLV, index, j + 1, val);
}
return 1;
}
struct cce_user
{
LPCWSTR name; /* channel to look for */
unsigned value, mask; /* how to change channel */
unsigned done; /* number of successful changes */
unsigned notdone; /* number of unsuccessful changes */
};
/******************************************************************
* change_channel_CB
*
* Callback used for changing a given channel attributes
*/
static int change_channel_CB(HANDLE hProcess, void* addr, WCHAR* buffer, void* pmt)
{
struct cce_user* user = (struct cce_user*)pmt;
if (!user->name || !wcscmp(buffer + 1, user->name))
{
buffer[0] = (buffer[0] & ~user->mask) | (user->value & user->mask);
if (WriteProcessMemory(hProcess, addr, buffer, 1, NULL))
user->done++;
else
user->notdone++;
}
return 1;
}
#ifdef WINE
/******************************************************************
* get_symbol
*
* Here it gets ugly :-(
* This is quick hack to get the address of first_dll in a running process
* We make the following assumptions:
* - libwine (lib) is loaded in all processes at the same address (or
* at least at the same address at this process)
* - we load the same libwine.so version in this process and in the
* examined process
* Final address is gotten by: 1/ querying the address of a known exported
* symbol out of libwine.so with dlsym, 2/ then querying nm on libwine.so to
* get the offset from the data segment of this known symbol and of first_dll,
* 3/ computing the actual address of first_dll by adding the result of 1/ and
* the delta of 2/.
* Ugly, yes, but it somehow works. We should replace that with debughlp
* library, that'd be way better. Exporting first_dll from libwine.so would make
* this code simpler, but still ugly.
*/
/* FIXME: we only need those includes for the next function */
#include <dlfcn.h> /* for RTLD_LAZY */
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
#include "wine/library.h"
void* get_symbol(HANDLE hProcess, const char* name, const char* lib)
{
char buffer[1024];
void* h;
DWORD addr = 0, tmp = 0;
FILE* f;
char* env;
if (!(h = wine_dlopen(lib, RTLD_LAZY, buffer, sizeof(buffer))))
{
printf("Couldn't load %s (%s)\n", lib, buffer);
return NULL;
}
env = getenv("LD_LIBRARY_PATH");
if (env)
{
char *next, *ptr;
struct stat s;
for (ptr = env = strdup(env); ptr; ptr = next)
{
next = strchr(ptr, ':');
if (next) *next++ = '\0';
sprintf(buffer, "nm %s", ptr);
if (buffer[strlen(buffer) - 1] != '/') strcat(buffer, "/");
strcat(buffer, lib);
if (stat(buffer + 3, &s) == 0) break;
}
free(env);
if (!ptr)
{
printf("Couldn't find %s in LD_LIBRARY_PATH\n", lib);
return NULL;
}
}
if (!(f = popen(buffer, "r")))
{
printf("Cannot execute '%s'\n", buffer);
return NULL;
}
while (fgets(buffer, sizeof(buffer), f))
{
char *p = buffer + strlen(buffer) - 1;
if (p < buffer) continue;
if (*p == '\n') *p-- = 0;
if (p - buffer < 11) continue;
buffer[8] = '\0';
if (!strcmp(&buffer[11], name)) addr += strtol(buffer, NULL, 16);
if (buffer[9] == 'D' && !tmp && (tmp = (DWORD)wine_dlsym(h, &buffer[11], NULL, 0)) != 0)
addr += tmp - strtol(buffer, NULL, 16);
}
pclose(f);
return (char*)addr;
}
#else
void* get_symbol(HANDLE hProcess, const char* name, const char* lib)
{
printf("get_symbol: not implemented on this platform\n");
return NULL;
}
#endif
struct dll_option_layout
{
void* next;
void* prev;
char* const* channels;
unsigned int nb_channels;
};
typedef int (*EnumChannelCB)(HANDLE, void*, WCHAR*, void*);
/******************************************************************
* enum_channel
*
* Enumerates all known channels on process hProcess through callback
* ce.
*/
static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user, unsigned unique)
{
struct dll_option_layout dol;
int ret = 1;
void* buf_addr;
WCHAR buffer[32];
void* addr;
WCHAR** cache = NULL;
unsigned i, j, num_cache, used_cache;
addr = get_symbol(hProcess, "first_dll", "libwine.so");
if (!addr) return -1;
if (unique)
cache = HeapAlloc(GetProcessHeap(), 0, (num_cache = 32) * sizeof(WCHAR*));
else
num_cache = 0;
used_cache = 0;
for (;
ret && addr && ReadProcessMemory(hProcess, addr, &dol, sizeof(dol), NULL);
addr = dol.next)
{
for (i = 0; i < dol.nb_channels; i++)
{
if (ReadProcessMemory(hProcess, (void*)(dol.channels + i), &buf_addr, sizeof(buf_addr), NULL) &&
ReadProcessMemory(hProcess, buf_addr, buffer, sizeof(buffer), NULL))
{
if (unique)
{
/* since some channels are defined in multiple compilation units,
* they will appear several times...
* so cache the channel's names we already reported and don't report
* them again
*/
for (j = 0; j < used_cache; j++)
if (!wcscmp(cache[j], buffer + 1)) break;
if (j != used_cache) continue;
if (used_cache == num_cache)
cache = HeapReAlloc(GetProcessHeap(), 0, cache, (num_cache *= 2) * sizeof(WCHAR*));
cache[used_cache++] = wcscpy(HeapAlloc(GetProcessHeap(), 0, (wcslen(buffer + 1) + 1) * sizeof(WCHAR)),
buffer + 1);
}
ret = ce(hProcess, buf_addr, buffer, user);
}
}
}
if (unique)
{
for (j = 0; j < used_cache; j++) HeapFree(GetProcessHeap(), 0, (WCHAR*)cache[j]);
HeapFree(GetProcessHeap(), 0, cache);
}
return 0;
}
static void DebugChannels_FillList(HWND hChannelLV)
{
HANDLE hProcess;
(void)ListView_DeleteAllItems(hChannelLV);
hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, GetSelectedProcessId());
if (!hProcess) return; /* FIXME messagebox */
SendMessageW(hChannelLV, WM_SETREDRAW, FALSE, 0);
enum_channel(hProcess, list_channel_CB, (void*)hChannelLV, TRUE);
SendMessageW(hChannelLV, WM_SETREDRAW, TRUE, 0);
CloseHandle(hProcess);
}
static void DebugChannels_OnCreate(HWND hwndDlg)
{
HWND hLV = GetDlgItem(hwndDlg, IDC_DEBUG_CHANNELS_LIST);
LVCOLUMN lvc;
lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH;
lvc.fmt = LVCFMT_LEFT;
lvc.pszText = L"Debug Channel";
lvc.cx = 100;
(void)ListView_InsertColumn(hLV, 0, &lvc);
lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH;
lvc.fmt = LVCFMT_CENTER;
lvc.pszText = L"Fixme";
lvc.cx = 55;
(void)ListView_InsertColumn(hLV, 1, &lvc);
lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH;
lvc.fmt = LVCFMT_CENTER;
lvc.pszText = L"Err";
lvc.cx = 55;
(void)ListView_InsertColumn(hLV, 2, &lvc);
lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH;
lvc.fmt = LVCFMT_CENTER;
lvc.pszText = L"Warn";
lvc.cx = 55;
(void)ListView_InsertColumn(hLV, 3, &lvc);
lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH;
lvc.fmt = LVCFMT_CENTER;
lvc.pszText = L"Trace";
lvc.cx = 55;
(void)ListView_InsertColumn(hLV, 4, &lvc);
DebugChannels_FillList(hLV);
}
static void DebugChannels_OnNotify(HWND hDlg, LPARAM lParam)
{
NMHDR* nmh = (NMHDR*)lParam;
switch (nmh->code)
{
case NM_CLICK:
if (nmh->idFrom == IDC_DEBUG_CHANNELS_LIST)
{
LVHITTESTINFO lhti;
HWND hChannelLV;
HANDLE hProcess;
NMITEMACTIVATE* nmia = (NMITEMACTIVATE*)lParam;
hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE, FALSE, GetSelectedProcessId());
if (!hProcess) return; /* FIXME message box */
lhti.pt = nmia->ptAction;
hChannelLV = GetDlgItem(hDlg, IDC_DEBUG_CHANNELS_LIST);
SendMessageW(hChannelLV, LVM_SUBITEMHITTEST, 0, (LPARAM)&lhti);
if (nmia->iSubItem >= 1 && nmia->iSubItem <= 4)
{
WCHAR val[2];
WCHAR name[32];
unsigned bitmask = 1 << (lhti.iSubItem - 1);
struct cce_user user;
ListView_GetItemText(hChannelLV, lhti.iItem, 0, name, sizeof(name) / sizeof(name[0]));
ListView_GetItemText(hChannelLV, lhti.iItem, lhti.iSubItem, val, sizeof(val) / sizeof(val[0]));
user.name = name;
user.value = (val[0] == L'x') ? 0 : bitmask;
user.mask = bitmask;
user.done = user.notdone = 0;
enum_channel(hProcess, change_channel_CB, &user, FALSE);
if (user.done)
{
val[0] ^= (L'x' ^ L' ');
ListView_SetItemText(hChannelLV, lhti.iItem, lhti.iSubItem, val);
}
if (user.notdone)
printf("Some channel instance weren't correctly set\n");
}
CloseHandle(hProcess);
}
break;
}
}
static INT_PTR CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message)
{
case WM_INITDIALOG:
DebugChannels_OnCreate(hDlg);
return TRUE;
case WM_COMMAND:
if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) {
EndDialog(hDlg, LOWORD(wParam));
return TRUE;
}
break;
case WM_NOTIFY:
DebugChannels_OnNotify(hDlg, lParam);
break;
}
return FALSE;
}
void ProcessPage_OnDebugChannels(void)
{
DialogBoxW(hInst, (LPCWSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, DebugChannelsDlgProc);
}

2
base/applications/taskmgr/dbgchnl.h
View file

@ -1,2 +0,0 @@
extern BOOL DebugChannelsAreSupported(void);
extern void ProcessPage_OnDebugChannels(void);

1
base/applications/taskmgr/lang/bg-BG.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "&Ниско", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Установяване на с&родство...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Обработка на обезбубяващите &канали...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/cs-CZ.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "Ní&zká", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Nastavit &afinitu...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Upravit &kanály ladění...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/da-DK.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "&Lav", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Sæt &Affinitet...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Redigere Debug &Kanaler...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/de-DE.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "N&iedrig", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "&Zugehörigkeit festlegen...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Debu&g-Kanäle ändern...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/el-GR.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "&Low", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Set &Affinity...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Edit Debug &Channels...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/en-US.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "&Low", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Set &Affinity...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Edit Debug &Channels...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/es-ES.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "&Baja", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Establecer &afinidad...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Editar &canales de depuración...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/et-EE.rc
View file

@ -142,7 +142,6 @@ BEGIN
MENUITEM "&Madal", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Määra &ühtivus...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Muuda silumiskanaleid...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/fr-FR.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "&Basse", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Définir l'&affinité...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Éditer les &canaux de débogage...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/he-IL.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "&נמוכה", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "הגדרת &קירבה", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Edit Debug &Channels...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/hu-HU.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "A&lacsony", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "&Processzorok használata...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Hibakeresõ &csatornák...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

3
base/applications/taskmgr/lang/id-ID.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "&Low", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Set &Affinity...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Edit Debug &Channels...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END
@ -225,7 +224,7 @@ BEGIN
EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY |
ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
GROUPBOX "Histori Pemakaian CPU", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT
GROUPBOX "Histori Pemakaian Memori", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
GROUPBOX "Histori Pemakaian MEM", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT
PUSHBUTTON "Tampilan Pemakaian CPU", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE
PUSHBUTTON "Tampilan Pemakaian MEM", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE
PUSHBUTTON "Histori Pemakaian CPU", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE

1
base/applications/taskmgr/lang/it-IT.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "&Bassa", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Definisci &Affinità...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Modifica Debug &Channels...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/ja-JP.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "低(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "関係の設定(&A)...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "デバッグ チャンネルの変更(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/ko-KR.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "낮음(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "선호도 설정(&A)", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "디버그 채널 편집(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/nl-NL.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "&Laag", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "&Affiniteit instellen...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Bewerk debug kanalen...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/no-NO.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "&Lav", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Sett &tiltrekning ...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Rediger Debug &kanaler...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/pl-PL.rc
View file

@ -143,7 +143,6 @@ BEGIN
MENUITEM "N&iski", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Ustaw &koligację...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Edytuj &kanały debugowania...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/pt-BR.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "&Baixa", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Editar &Canais de depuração...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/ro-RO.rc
View file

@ -141,7 +141,6 @@ BEGIN
MENUITEM "Prioritate &minimă", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "A&finitate…", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "&Canale de depanare…", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/ru-RU.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "&Низкий", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Задать &соответствие...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Редактировать отладку &потоков...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/sk-SK.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "Níz&ka", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Nastaviť &afinitu...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Upraviť &kanály ladenia...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

3
base/applications/taskmgr/lang/sq-AL.rc
View file

@ -1,4 +1,4 @@
/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
* DATE OF TR: 29-11-2013
*/
@ -139,7 +139,6 @@ BEGIN
MENUITEM "Poshte", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Vendos prirje...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Modifiko Debug &Channels...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/sv-SE.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "&Låg", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Välj &källa (FIXME)...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Ändra felsökningskanaler...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/tr-TR.rc
View file

@ -137,7 +137,6 @@ BEGIN
MENUITEM "Dü&şük", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "İ&lişkiyi Ayarla...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Y&anlışlık Ayıklama Yollarını Düzenle...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/uk-UA.rc
View file

@ -135,7 +135,6 @@ BEGIN
MENUITEM "&Низький", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "У&становити відповідність...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Редагувати налагодження &потоків...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/zh-CN.rc
View file

@ -142,7 +142,6 @@ BEGIN
MENUITEM "低(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "关系设置(&A)...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "编辑调试频道(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/lang/zh-TW.rc
View file

@ -143,7 +143,6 @@ BEGIN
MENUITEM "低(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "親和性設定(&A)...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "編輯偵錯頻道(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END

1
base/applications/taskmgr/precomp.h
View file

@ -24,7 +24,6 @@
#include "perfdata.h"
#include "procpage.h"
#include "applpage.h"
#include "dbgchnl.h"
#include "endproc.h"
#include "graph.h"
#include "graphctl.h"

7
base/applications/taskmgr/procpage.c
View file

@ -364,9 +364,6 @@ void ProcessPageShowContextMenu(DWORD dwProcessId)
if (si.dwNumberOfProcessors < 2)
RemoveMenu(hSubMenu, ID_PROCESS_PAGE_SETAFFINITY, MF_BYCOMMAND);
if (!DebugChannelsAreSupported())
RemoveMenu(hSubMenu, ID_PROCESS_PAGE_DEBUGCHANNELS, MF_BYCOMMAND);
switch (dwProcessPriorityClass) {
case REALTIME_PRIORITY_CLASS:
CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, MF_BYCOMMAND);
@ -481,7 +478,7 @@ void UpdateProcesses()
SendMessage(hProcessPageListCtrl, WM_SETREDRAW, TRUE, 0);
/* Select first item if any */
if ((ListView_GetNextItem(hProcessPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) &&
if ((ListView_GetNextItem(hProcessPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) &&
(ListView_GetItemCount(hProcessPageListCtrl) > 0) && !bProcessPageSelectionMade)
{
ListView_SetItemState(hProcessPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);
@ -495,7 +492,7 @@ void UpdateProcesses()
*/
}
BOOL ProcessRunning(ULONG ProcessId)
BOOL ProcessRunning(ULONG ProcessId)
{
HANDLE hProcess;
DWORD exitCode;

1
base/applications/taskmgr/resource.h
View file

@ -179,7 +179,6 @@
#define ID_PROCESS_PAGE_SETPRIORITY_NORMAL 32812
#define ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL 32813
#define ID_PROCESS_PAGE_SETPRIORITY_LOW 32814
#define ID_PROCESS_PAGE_DEBUGCHANNELS 32815
#define ID_SHUTDOWN_STANDBY 32816
#define ID_SHUTDOWN_HIBERNATE 32817

9
base/applications/taskmgr/taskmgr.c
View file

@ -56,7 +56,7 @@ TASKMANAGER_SETTINGS TaskManagerSettings;
// http://www.catch22.net/software/winspy
// Copyright (c) 2002 by J Brown
//
//
// Copied from uxtheme.h
// If you have this new header, then delete these and
@ -67,7 +67,7 @@ TASKMANAGER_SETTINGS TaskManagerSettings;
#define ETDT_USETABTEXTURE 0x00000004
#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE)
//
//
typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD);
//
@ -82,7 +82,7 @@ BOOL EnableDialogTheme(HWND hwnd)
if(hUXTheme)
{
fnEnableThemeDialogTexture =
fnEnableThemeDialogTexture =
(ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture");
if(fnEnableThemeDialogTexture)
@ -324,9 +324,6 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
case ID_PROCESS_PAGE_SETPRIORITY_LOW:
DoSetPriority(IDLE_PRIORITY_CLASS);
break;
case ID_PROCESS_PAGE_DEBUGCHANNELS:
ProcessPage_OnDebugChannels();
break;
/* ShutDown items */
case ID_SHUTDOWN_STANDBY: