diff --git a/.gitignore b/.gitignore index 8ce4a09bc21..3b17d9a36d2 100644 --- a/.gitignore +++ b/.gitignore @@ -643,14 +643,8 @@ programs/rundll32/rundll32 programs/spoolsv/spoolsv programs/start/rsrc.res programs/start/start -programs/taskmgr/font.bmp programs/taskmgr/taskmgr -programs/taskmgr/taskmgr.ico programs/taskmgr/taskmgr.res -programs/taskmgr/trayicon.bmp -programs/taskmgr/traymask.bmp -programs/taskmgr/window.ico -programs/taskmgr/windowsm.ico programs/uninstaller/rsrc.res programs/uninstaller/uninstaller programs/uninstaller/uninstaller.ico diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index c95379c36ed..82ecc96a2db 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -30,14 +30,6 @@ C_SRCS = \ trayicon.c RC_SRCS = taskmgr.rc -RC_BINSRC = taskmgr.rc -RC_BINARIES = \ - font.bmp \ - taskmgr.ico \ - trayicon.bmp \ - traymask.bmp \ - window.ico \ - windowsm.ico @MAKE_PROG_RULES@ diff --git a/programs/taskmgr/font.bmp b/programs/taskmgr/font.bmp new file mode 100644 index 00000000000..c1f8410c932 Binary files /dev/null and b/programs/taskmgr/font.bmp differ diff --git a/programs/taskmgr/taskmgr.ico b/programs/taskmgr/taskmgr.ico new file mode 100644 index 00000000000..727ad7be44d Binary files /dev/null and b/programs/taskmgr/taskmgr.ico differ diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index 41bc1dce435..2af1105f038 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -45,156 +45,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Icon with lowest ID value placed first to ensure application icon remains consistent on all systems. */ -/* BINRES taskmgr.ico */ +/* @makedep: taskmgr.ico */ IDI_TASKMANAGER ICON DISCARDABLE taskmgr.ico -/* { - '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 26 00 00 00 10 10 10 00 00 00 00 00 28 01' - '00 00 0E 03 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80' - '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 FF F7 77 88 80 00 00 00 00 F7' - '77 77 77 80 00 00 07 77 88 88 00 00 00 00 00 F7' - '77 87 87 88 00 00 00 88 88 80 00 00 00 00 00 F7' - '77 87 87 88 80 00 00 00 00 00 00 00 00 00 00 F7' - '77 87 87 88 08 88 88 88 88 88 88 88 00 00 00 F7' - '97 87 87 80 87 77 77 77 77 77 77 77 70 00 00 F7' - '77 87 87 80 77 FF FF FF FF FF FF F7 70 00 00 F7' - '77 87 87 80 78 00 00 00 00 00 0A AF 70 00 00 F7' - '27 87 87 80 78 AA 00 00 00 00 A2 0F 70 00 00 F7' - 'A2 77 77 80 78 02 A0 0A 00 0A 20 0F 70 00 00 F7' - '77 77 77 80 78 00 2A A2 A0 0A 00 0F 70 00 00 F7' - '00 07 87 80 78 00 00 00 A0 0A 00 0F 70 00 00 F7' - '88 77 F7 80 78 00 08 00 2A 0A 00 0F 70 00 00 F7' - '77 77 77 80 78 00 8F 80 0A A2 00 0F 70 00 00 F7' - '77 77 77 80 78 00 08 00 02 A0 00 0F 70 00 00 F7' - '00 00 07 80 78 00 00 00 00 A0 00 0F 70 00 00 F7' - '88 88 77 80 7F 88 88 88 88 88 88 87 70 00 00 F7' - '77 77 77 80 FF 77 77 77 77 77 77 77 70 00 00 F7' - '00 00 07 88 07 FF FF FF FF FF FF FF 00 00 00 F7' - '88 88 77 88 80 00 00 00 00 00 00 00 00 00 00 F7' - '77 77 77 88 80 00 00 00 00 00 00 00 00 00 00 0F' - 'FF FF FF 88 80 00 00 00 00 00 00 00 00 00 00 07' - '77 77 77 78 80 00 00 00 00 00 00 00 00 00 00 00' - '77 77 77 77 80 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' - 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' - '00 7F C0 3C 00 1F 80 0F 00 7F 80 07 80 FF 80 00' - '00 0F 80 00 00 07 80 00 00 03 80 00 00 03 80 00' - '00 03 80 00 00 03 80 00 00 03 80 00 00 03 80 00' - '00 03 80 00 00 03 80 00 00 03 80 00 00 03 80 00' - '00 03 80 00 00 03 80 00 00 03 80 00 00 07 80 00' - '00 0F 80 03 FF FF 80 03 FF FF C0 03 FF FF E0 03' - 'FF FF F0 03 FF FF FF FF FF FF FF FF FF FF 28 00' - '00 00 10 00 00 00 20 00 00 00 01 00 04 00 00 00' - '00 00 C0 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 F8 78 80 00 0F 77' - '78 00 0F 78 00 00 0F 78 70 88 88 88 80 00 0F 78' - '70 F7 77 77 77 00 0F 78 70 F2 A0 00 A8 00 0F AF' - '70 F0 2A 0A 08 00 0F 77 70 F0 00 A2 08 00 0F 00' - '70 F0 F0 A0 08 00 0F 77 70 F8 88 88 88 00 0F 00' - '70 FF FF FF FF 00 0F FF F8 00 00 00 00 00 08 77' - '78 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 FF FF 00 00 FF 07 00 00 82 03' - '00 00 01 07 00 00 00 03 00 00 00 01 00 00 00 01' - '00 00 00 01 00 00 00 01 00 00 00 01 00 00 00 01' - '00 00 00 01 00 00 00 03 00 00 01 FF 00 00 81 FF' - '00 00 FF FF 00 00' -} */ -/* BINRES window.ico */ +/* @makedep: window.ico */ IDI_WINDOW ICON DISCARDABLE window.ico -/* { - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80' - '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 80 87 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F' - 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 88' - '88 88 88 88 88 88 88 88 88 88 88 88 87 80 87 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 80 87 44' - '44 44 44 44 44 44 44 44 40 00 00 00 00 80 87 44' - '44 44 44 44 44 44 44 44 47 70 77 07 70 80 87 44' - '44 44 44 44 44 44 44 44 47 70 77 07 70 80 87 44' - '44 44 44 44 44 44 44 44 44 44 44 44 44 80 87 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 80 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 80 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' - 'FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 FF FF FF FF' -} */ -/* BINRES windowsm.ico */ +/* @makedep: windowsm.ico */ IDI_WINDOWSM ICON DISCARDABLE windowsm.ico -/* { - '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01' - '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00' - '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80' - '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 88 88' - '88 88 88 88 88 80 87 FF FF FF FF FF FF 80 87 FF' - 'FF FF FF FF FF 80 87 FF FF FF FF FF FF 80 87 FF' - 'FF FF FF FF FF 80 87 FF FF FF FF FF FF 80 87 FF' - 'FF FF FF FF FF 80 87 FF FF FF FF FF FF 80 87 88' - '88 88 88 88 88 80 87 44 44 44 F0 F0 F0 80 87 44' - '44 44 44 44 44 80 87 77 77 77 77 77 77 80 88 88' - '88 88 88 88 88 88 00 00 00 00 00 00 00 00 FF FF' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 FF FF 00 00' -} */ /* Version @@ -237,90 +95,11 @@ END Bitmap */ -/* BINRES traymask.bmp */ +/* @makedep: traymask.bmp */ IDB_TRAYMASK BITMAP DISCARDABLE traymask.bmp -/* { - '42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00' - '00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 FF FF FF FF FF FF FF FF FF FF' - 'FF FF FF FF FF FF FF 00 00 00 00 00 00 FF FF 00' - '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00' - '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00' - '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00' - '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00' - '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00' - '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF FF' - 'FF FF FF FF FF FF' -} */ -/* BINRES trayicon.bmp */ +/* @makedep: trayicon.bmp */ IDB_TRAYICON BITMAP DISCARDABLE trayicon.bmp -/* { - '42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00' - '00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 8F FF FF FF FF FF 00 00 80' - '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80' - '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80' - '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80' - '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80' - '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80' - '20 20 20 20 2F 00 00 88 88 88 88 88 8F 00 00 00' - '00 00 00 00 00 00' -} */ -/* BINRES font.bmp */ +/* @makedep: font.bmp */ IDB_FONT BITMAP DISCARDABLE font.bmp -/* { - '42 4D 86 02 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 60 00 00 00 0B 00 00 00 01 00 04 00 00 00' - '00 00 10 02 00 00 74 12 00 00 74 12 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 AA AA AA A0 00 00 0A 00 AA AA' - 'AA A0 AA AA AA A0 00 00 00 A0 AA AA AA A0 AA AA' - 'AA A0 00 00 00 A0 AA AA AA A0 AA AA AA A0 A0 00' - '00 A0 00 00 00 00 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 00' - '0A 00 00 00 AA 00 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 00' - 'A0 00 A0 0A 00 A0 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 0A' - '00 00 0A 00 AA 00 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 A0' - '00 00 00 A0 00 00 A0 00 00 A0 00 00 0A 00 AA AA' - 'AA A0 0A AA AA A0 AA AA AA A0 AA AA AA A0 AA AA' - 'AA A0 00 00 00 A0 AA AA AA A0 AA AA AA A0 AA 00' - '00 00 00 0A 00 00 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 A0' - '00 00 00 00 A0 00 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 0A' - '00 00 0A A0 0A 00 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 00' - 'A0 00 A0 0A 00 A0 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 00' - '0A 00 0A A0 00 00 AA AA AA A0 00 00 0A 00 AA AA' - 'AA A0 AA AA AA A0 A0 00 00 A0 AA AA AA A0 AA AA' - 'AA A0 AA AA AA A0 AA AA AA A0 AA AA AA A0 A0 00' - '00 A0 00 00 00 00' -} */ diff --git a/programs/taskmgr/trayicon.bmp b/programs/taskmgr/trayicon.bmp new file mode 100644 index 00000000000..d0572453c3e Binary files /dev/null and b/programs/taskmgr/trayicon.bmp differ diff --git a/programs/taskmgr/traymask.bmp b/programs/taskmgr/traymask.bmp new file mode 100644 index 00000000000..73379b1928c Binary files /dev/null and b/programs/taskmgr/traymask.bmp differ diff --git a/programs/taskmgr/window.ico b/programs/taskmgr/window.ico new file mode 100644 index 00000000000..1b9d3ad85a4 Binary files /dev/null and b/programs/taskmgr/window.ico differ diff --git a/programs/taskmgr/windowsm.ico b/programs/taskmgr/windowsm.ico new file mode 100644 index 00000000000..9d4b2cff3bd Binary files /dev/null and b/programs/taskmgr/windowsm.ico differ