Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[cfinck] 31678: Remove the (already commented) BINRES icons as taskmgr is not synchronized with Wine and Wine also allows binary files in their repo nowadays. Also remove another Wine-specific check, which was already useless.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 9 02:05:19 2008 New Revision: 31678 URL: http://svn.reactos.org/svn/reactos?rev=31678&view=rev Log: Remove the (already commented) BINRES icons as taskmgr is not synchronized with Wine and Wine also allows binary files in their repo nowadays. Also remove another Wine-specific check, which was already useless. Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.rc (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.rc Wed Jan 9 02:05:19 2008 @@ -1,204 +1,10 @@ +#include "resource.h" +#include <windows.h> -#include "resource.h" -#include "windows.h" - -#ifdef WINE -#define res . -#else -#define res res -#endif - -/* BINRES taskmgr.ico */ IDI_TASKMANAGER ICON DISCARDABLE "res/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 */ IDI_WINDOW ICON DISCARDABLE "res/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 */ IDI_WINDOWSM ICON DISCARDABLE "res/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' -} */ - -/* BINRES traymask.bmp */ IDB_TRAYMASK BITMAP DISCARDABLE "res/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 */ IDB_TRAYICON BITMAP DISCARDABLE "res/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' -} */ #include "rsrc.rc"

16 years, 10 months

[cfinck] 31677: Get rid of much more duplicated code in taskmgr (patch by Carlo Bramini, carlo DOT bramix AT libero DOT it) I also got rid of 6 other functions, which all just call the same function. See issue #2941 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 9 01:52:56 2008 New Revision: 31677 URL: http://svn.reactos.org/svn/reactos?rev=31677&view=rev Log: Get rid of much more duplicated code in taskmgr (patch by Carlo Bramini, carlo DOT bramix AT libero DOT it) I also got rid of 6 other functions, which all just call the same function. See issue #2941 for more details. Modified: trunk/reactos/base/applications/taskmgr/priority.c trunk/reactos/base/applications/taskmgr/priority.h trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.h Modified: trunk/reactos/base/applications/taskmgr/priority.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/priority.c (original) +++ trunk/reactos/base/applications/taskmgr/priority.c Wed Jan 9 01:52:56 2008 @@ -23,20 +23,18 @@ #include <precomp.h> -WCHAR szTemp[256]; -WCHAR szTempA[256]; - -void ProcessPage_OnSetPriorityRealTime(void) +void DoSetPriority(DWORD priority) { LVITEM lvitem; ULONG Index; DWORD dwProcessId; HANDLE hProcess; - WCHAR strErrorText[260]; + WCHAR szText[260]; + WCHAR szTitle[256]; for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { - memset(&lvitem, 0, sizeof(LVITEM)); + ZeroMemory(&lvitem, sizeof(LVITEM)); lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; @@ -53,287 +51,27 @@ if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) return; - LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); + LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szText, 260); + if (MessageBoxW(hMainWnd, szText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES) return; hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcess) { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + GetLastErrorText(szText, 260); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTitle, 256); + MessageBoxW(hMainWnd, szText, szTitle, MB_OK|MB_ICONSTOP); return; } - if (!SetPriorityClass(hProcess, REALTIME_PRIORITY_CLASS)) + if (!SetPriorityClass(hProcess, priority)) { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + GetLastErrorText(szText, 260); + LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTitle, 256); + MessageBoxW(hMainWnd, szText, szTitle, MB_OK|MB_ICONSTOP); } CloseHandle(hProcess); } - -void ProcessPage_OnSetPriorityHigh(void) -{ - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - WCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, HIGH_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); -} - -void ProcessPage_OnSetPriorityAboveNormal(void) -{ - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - WCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, ABOVE_NORMAL_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); -} - -void ProcessPage_OnSetPriorityNormal(void) -{ - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - WCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, NORMAL_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); -} - -void ProcessPage_OnSetPriorityBelowNormal(void) -{ - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - WCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, BELOW_NORMAL_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); -} - -void ProcessPage_OnSetPriorityLow(void) -{ - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - WCHAR strErrorText[260]; - - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); - - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - - (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); - - if (lvitem.state & LVIS_SELECTED) - break; - } - - dwProcessId = PerfDataGetProcessId(Index); - - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - - LoadStringW(hInst, IDS_MSG_WARNINGCHANGEPRIORITY, szTemp, 256); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) - return; - - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - return; - } - - if (!SetPriorityClass(hProcess, IDLE_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLECHANGEPRIORITY, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); - } - - CloseHandle(hProcess); -} Modified: trunk/reactos/base/applications/taskmgr/priority.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/priority.h (original) +++ trunk/reactos/base/applications/taskmgr/priority.h Wed Jan 9 01:52:56 2008 @@ -23,11 +23,6 @@ #ifndef __PRIORITY_H #define __PRIORITY_H -void ProcessPage_OnSetPriorityRealTime(void); -void ProcessPage_OnSetPriorityHigh(void); -void ProcessPage_OnSetPriorityAboveNormal(void); -void ProcessPage_OnSetPriorityNormal(void); -void ProcessPage_OnSetPriorityBelowNormal(void); -void ProcessPage_OnSetPriorityLow(void); +void DoSetPriority(DWORD priority); #endif /* __PRIORITY_H */ 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 (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Wed Jan 9 01:52:56 2008 @@ -212,22 +212,22 @@ ProcessPage_OnSetAffinity(); break; case ID_PROCESS_PAGE_SETPRIORITY_REALTIME: - ProcessPage_OnSetPriorityRealTime(); + DoSetPriority(REALTIME_PRIORITY_CLASS); break; case ID_PROCESS_PAGE_SETPRIORITY_HIGH: - ProcessPage_OnSetPriorityHigh(); + DoSetPriority(HIGH_PRIORITY_CLASS); break; case ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL: - ProcessPage_OnSetPriorityAboveNormal(); + DoSetPriority(ABOVE_NORMAL_PRIORITY_CLASS); break; case ID_PROCESS_PAGE_SETPRIORITY_NORMAL: - ProcessPage_OnSetPriorityNormal(); + DoSetPriority(NORMAL_PRIORITY_CLASS); break; case ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL: - ProcessPage_OnSetPriorityBelowNormal(); + DoSetPriority(BELOW_NORMAL_PRIORITY_CLASS); break; case ID_PROCESS_PAGE_SETPRIORITY_LOW: - ProcessPage_OnSetPriorityLow(); + DoSetPriority(IDLE_PRIORITY_CLASS); break; case ID_PROCESS_PAGE_DEBUGCHANNELS: ProcessPage_OnDebugChannels(); Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.h (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.h Wed Jan 9 01:52:56 2008 @@ -124,7 +124,7 @@ LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); #ifdef __cplusplus -}; +} #endif #endif /* __TASKMGR_H__ */

16 years, 10 months

[cfinck] 31676: Also create the temporary directory if it does not exist. See issue #2518 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 9 00:22:27 2008 New Revision: 31676 URL: http://svn.reactos.org/svn/reactos?rev=31676&view=rev Log: Also create the temporary directory if it does not exist. See issue #2518 for more details. Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=31676&r1=3167… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Jan 9 00:22:27 2008 @@ -372,6 +372,9 @@ ${mkdir} $@ endif +$(TEMPORARY): + ${mkdir} $@ + BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h include lib/lib.mak

16 years, 10 months

[cfinck] 31675: - Don't stop processing the keyboard layouts, when no "Keyboard Layouts\Substitudes" key exists (WinXP's input.dll behaves the same way). Now input.dll already shows us the current selected keyboard layout under ROS :-) - Make the dialogs a bit wider, so all captions (at least of the german dialog) are shown. - Fix indentation

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 9 00:17:24 2008 New Revision: 31675 URL: http://svn.reactos.org/svn/reactos?rev=31675&view=rev Log: - Don't stop processing the keyboard layouts, when no "Keyboard Layouts\Substitudes" key exists (WinXP's input.dll behaves the same way). Now input.dll already shows us the current selected keyboard layout under ROS :-) - Make the dialogs a bit wider, so all captions (at least of the german dialog) are shown. - Fix indentation Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/settings.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r…

16 years, 10 months

[hpoussin] 31674: Update _ros.diff file after r31673

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Jan 8 20:25:01 2008 New Revision: 31674 URL: http://svn.reactos.org/svn/reactos?rev=31674&view=rev Log: Update _ros.diff file after r31673 Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff Tue Jan 8 20:25:01 2008 @@ -23,6 +23,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); static const WCHAR g_szHttp1_0[] = {' ','H','T','T','P','/','1','.','0',0 }; +@@ -3027,14 +3028,21 @@ + /* + * HACK peek at the buffer + */ ++#if 0 ++ /* This is Wine code, we don't support MSG_PEEK yet so we have to do it ++ a bit different */ + NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc); ++#endif + /* + * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. + */ + buflen = MAX_REPLY_LEN; + memset(buffer, 0, MAX_REPLY_LEN); + if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen)) + goto lend; ++#if 1 ++ rc = buflen; ++#endif + MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); + + /* regenerate raw headers */ Index: inet_ntop.c =================================================================== --- inet_ntop.c (revision 30893)

16 years, 10 months

[cwittich] 31673: fix downloader!

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 8 20:16:51 2008 New Revision: 31673 URL: http://svn.reactos.org/svn/reactos?rev=31673&view=rev Log: fix downloader! Modified: trunk/reactos/dll/win32/wininet/http.c Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c (original) +++ trunk/reactos/dll/win32/wininet/http.c Tue Jan 8 20:16:51 2008 @@ -3027,8 +3027,11 @@ /* * HACK peek at the buffer */ +#if 0 + /* This is Wine code, we don't support MSG_PEEK yet so we have to do it + a bit different */ NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc); - +#endif /* * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. */ @@ -3036,6 +3039,9 @@ memset(buffer, 0, MAX_REPLY_LEN); if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen)) goto lend; +#if 1 + rc = buflen; +#endif MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* regenerate raw headers */

16 years, 10 months

[dreimer] 31672: Revert Manifest Commits due to popular demand. They will be Autogenerated by RBuild in the Future.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 8 19:13:01 2008 New Revision: 31672 URL: http://svn.reactos.org/svn/reactos?rev=31672&view=rev Log: Revert Manifest Commits due to popular demand. They will be Autogenerated by RBuild in the Future. Removed: trunk/reactos/base/applications/calc/manifest.xml trunk/reactos/base/applications/control/manifest.xml trunk/reactos/base/applications/games/solitaire/manifest.xml trunk/reactos/base/applications/msconfig/manifest.xml trunk/reactos/base/applications/notepad/manifest.xml trunk/reactos/base/applications/regedit/clb/manifest.xml trunk/reactos/base/applications/regedit/manifest.xml trunk/reactos/base/applications/taskmgr/manifest.xml trunk/reactos/base/applications/winhelp/manifest.xml trunk/reactos/base/setup/reactos/manifest.xml trunk/reactos/base/setup/welcome/manifest.xml trunk/reactos/base/system/winlogon/manifest.xml trunk/reactos/dll/win32/aclui/manifest.xml trunk/reactos/dll/win32/console/manifest.xml trunk/reactos/dll/win32/devmgr/manifest.xml trunk/reactos/dll/win32/modemui/manifest.xml trunk/reactos/dll/win32/netid/manifest.xml trunk/reactos/dll/win32/newdev/manifest.xml trunk/reactos/dll/win32/shell32/manifest.xml trunk/reactos/dll/win32/shellext/deskadp/manifest.xml trunk/reactos/dll/win32/shellext/deskmon/manifest.xml trunk/reactos/dll/win32/shellext/slayer/manifest.xml trunk/reactos/dll/win32/syssetup/manifest.xml Modified: trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/base/applications/charmap/manifest.xml trunk/reactos/base/applications/control/control.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/manifest.xml trunk/reactos/base/applications/mmc/manifest.xml trunk/reactos/base/applications/msconfig/msconfig.rc trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml trunk/reactos/base/applications/mscutils/servman/manifest.xml trunk/reactos/base/applications/mstsc/manifest.xml trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/regedit/regedit.rc trunk/reactos/base/applications/sndvol32/manifest.xml trunk/reactos/base/applications/taskmgr/taskmgr.rc trunk/reactos/base/applications/winhelp/rsrc.rc trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/welcome/welcome.rc trunk/reactos/base/shell/explorer-new/manifest.xml trunk/reactos/base/system/winlogon/winlogon.rc trunk/reactos/dll/cpl/access/manifest.xml trunk/reactos/dll/cpl/appwiz/manifest.xml trunk/reactos/dll/cpl/desk/manifest.xml trunk/reactos/dll/cpl/hdwwiz/manifest.xml trunk/reactos/dll/cpl/input/manifest.xml trunk/reactos/dll/cpl/intl/manifest.xml trunk/reactos/dll/cpl/joy/manifest.xml trunk/reactos/dll/cpl/liccpa/manifest.xml trunk/reactos/dll/cpl/main/manifest.xml trunk/reactos/dll/cpl/mmsys/manifest.xml trunk/reactos/dll/cpl/ncpa/manifest.xml trunk/reactos/dll/cpl/powercfg/manifest.xml trunk/reactos/dll/cpl/telephon/manifest.xml trunk/reactos/dll/cpl/timedate/manifest.xml trunk/reactos/dll/cpl/usrmgr/manifest.xml trunk/reactos/dll/win32/aclui/aclui.rc trunk/reactos/dll/win32/console/console.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/netid/netid.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/rasdlg/manifest.xml trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shellext/deskadp/deskadp.rc trunk/reactos/dll/win32/shellext/deskmon/deskmon.rc trunk/reactos/dll/win32/shellext/slayer/slayer.rc trunk/reactos/dll/win32/syssetup/syssetup.rc Removed: trunk/reactos/base/applications/calc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/man… ============================================================================== --- trunk/reactos/base/applications/calc/manifest.xml (original) +++ trunk/reactos/base/applications/calc/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Calculator" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Calculator</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Tue Jan 8 19:13:01 2008 @@ -22,8 +22,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_CALCICON ICON "calculator.ico" Modified: trunk/reactos/base/applications/charmap/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/manifest.xml (original) +++ trunk/reactos/base/applications/charmap/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,7 +3,7 @@ xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - name="ReactOS.Application.Character.Map" + name="Win32 Application.default.App" processorArchitecture="x86" version="1.0.0.0" type="win32"/> Modified: trunk/reactos/base/applications/control/control.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.rc (original) +++ trunk/reactos/base/applications/control/control.rc Tue Jan 8 19:13:01 2008 @@ -1,3 +1,5 @@ +//Microsoft Developer Studio generated resource script. +// #include "resource.h" #include <reactos/resource.h> #include <windows.h> @@ -5,15 +7,22 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "control\0" #define REACTOS_STR_ORIGINAL_FILENAME "control.exe\0" - -1 24 DISCARDABLE "manifest.xml" - #ifndef MS_COMPILER #include <reactos/version.rc> #else #include <../../../include/reactos/version.rc> #endif + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. IDI_MAINICON ICON DISCARDABLE "resources/config.ico" +///////////////////////////////////////////////////////////////////////////// + #include "rsrc.rc" Removed: trunk/reactos/base/applications/control/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/manifest.xml (original) +++ trunk/reactos/base/applications/control/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Control.Panel" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Control Panel</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Removed: trunk/reactos/base/applications/games/solitaire/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/manifest.xml (original) +++ trunk/reactos/base/applications/games/solitaire/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Tue Jan 8 19:13:01 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico" Modified: trunk/reactos/base/applications/games/winemine/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/manifest.xml (original) +++ trunk/reactos/base/applications/games/winemine/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,7 +3,7 @@ xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - name="ReactOS.Application.WineMine" + name="ReactOS.WineMine" processorArchitecture="x86" version="1.0.0.0" type="win32"/> Modified: trunk/reactos/base/applications/mmc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mani… ============================================================================== --- trunk/reactos/base/applications/mmc/manifest.xml (original) +++ trunk/reactos/base/applications/mmc/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,7 +3,7 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.Application.System.Management.Console" + name="ReactOS.System.Management.Console" type="win32" /> <description>ReactOS System Management Console</description> Removed: trunk/reactos/base/applications/msconfig/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/manifest.xml (original) +++ trunk/reactos/base/applications/msconfig/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Configurator" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Configuration Tool</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/msconfig/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rc (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rc Tue Jan 8 19:13:01 2008 @@ -10,9 +10,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Configuration Tool\0" #define REACTOS_STR_INTERNAL_NAME "msconfig\0" #define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe\0" - -1 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> IDI_APPICON ICON "res/msconfig.ico" Modified: trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,7 +3,7 @@ xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - name="ReactOS.Application.Device.Manager" + name="Win32 Application.default.App" processorArchitecture="x86" version="1.0.0.0" type="win32"/> Modified: trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,7 +3,7 @@ xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - name="ReactOS.Application.EventLog.Viewer" + name="Win32 Application.default.App" processorArchitecture="x86" version="1.0.0.0" type="win32"/> Modified: trunk/reactos/base/applications/mscutils/servman/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/manifest.xml (original) +++ trunk/reactos/base/applications/mscutils/servman/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,7 +3,7 @@ xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - name="ReactOS.Application.Service.Manager" + name="Win32 Application.default.App" processorArchitecture="x86" version="1.0.0.0" type="win32"/> Modified: trunk/reactos/base/applications/mstsc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ma… ============================================================================== --- trunk/reactos/base/applications/mstsc/manifest.xml (original) +++ trunk/reactos/base/applications/mstsc/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,11 +3,11 @@ xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - name="ReactOS.Application.Remote.Desktop.Client" + name="Win32 Application.default.App" processorArchitecture="x86" version="1.0.0.0" type="win32"/> -<description>ReactOS Remote Desktop Client</description> +<description>ReactOS Service Manager</description> <dependency> <dependentAssembly> <assemblyIdentity Removed: trunk/reactos/base/applications/notepad/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/manifest.xml (original) +++ trunk/reactos/base/applications/notepad/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.NotePad" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS NotePad</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc Tue Jan 8 19:13:01 2008 @@ -24,8 +24,6 @@ #include "winnls.h" #include "commctrl.h" #include "notepad_res.h" - -1 24 DISCARDABLE "manifest.xml" IDI_NPICON ICON "res/notepad.ico" Removed: trunk/reactos/base/applications/regedit/clb/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/manifest.xml (original) +++ trunk/reactos/base/applications/regedit/clb/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Removed: trunk/reactos/base/applications/regedit/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/manifest.xml (original) +++ trunk/reactos/base/applications/regedit/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.RegEdit" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Registry Editor</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/regedit/regedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rc (original) +++ trunk/reactos/base/applications/regedit/regedit.rc Tue Jan 8 19:13:01 2008 @@ -25,9 +25,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Explorer\0" #define REACTOS_STR_INTERNAL_NAME "regedit\0" #define REACTOS_STR_ORIGINAL_FILENAME "regedit.exe\0" - -1 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US Modified: trunk/reactos/base/applications/sndvol32/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/manifest.xml (original) +++ trunk/reactos/base/applications/sndvol32/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,7 +3,7 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.Application.Volume.Control" + name="ReactOS.Sound.Volume.Control" type="win32" /> <description>ReactOS Volume Control</description> Removed: trunk/reactos/base/applications/taskmgr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/manifest.xml (original) +++ trunk/reactos/base/applications/taskmgr/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Task.Manager" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Task Manager</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.rc (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.rc Tue Jan 8 19:13:01 2008 @@ -7,8 +7,6 @@ #else #define res res #endif - -1 24 DISCARDABLE "manifest.xml" /* BINRES taskmgr.ico */ IDI_TASKMANAGER ICON DISCARDABLE "res/taskmgr.ico" Removed: trunk/reactos/base/applications/winhelp/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/manifest.xml (original) +++ trunk/reactos/base/applications/winhelp/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.WinHelp" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Help</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/applications/winhelp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/rsrc.rc (original) +++ trunk/reactos/base/applications/winhelp/rsrc.rc Tue Jan 8 19:13:01 2008 @@ -22,8 +22,6 @@ #include <windows.h> #include "winhelp.h" #include "winhelp_res.h" - -1 24 DISCARDABLE "manifest.xml" #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" Removed: trunk/reactos/base/setup/reactos/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/manifes… ============================================================================== --- trunk/reactos/base/setup/reactos/manifest.xml (original) +++ trunk/reactos/base/setup/reactos/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.ReactOS" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS CD Autostart</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc (original) +++ trunk/reactos/base/setup/reactos/reactos.rc Tue Jan 8 19:13:01 2008 @@ -6,9 +6,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup\0" #define REACTOS_STR_INTERNAL_NAME "reactos\0" #define REACTOS_STR_ORIGINAL_FILENAME "reactos.exe\0" - -1 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> Removed: trunk/reactos/base/setup/welcome/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/manifes… ============================================================================== --- trunk/reactos/base/setup/welcome/manifest.xml (original) +++ trunk/reactos/base/setup/welcome/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Welcome" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Welcome App</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.rc (original) +++ trunk/reactos/base/setup/welcome/welcome.rc Tue Jan 8 19:13:01 2008 @@ -6,9 +6,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS-Welcome\0" #define REACTOS_STR_INTERNAL_NAME "welcome\0" #define REACTOS_STR_ORIGINAL_FILENAME "welcome.exe\0" - -1 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> #include "rsrc.rc" Modified: trunk/reactos/base/shell/explorer-new/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ma… ============================================================================== --- trunk/reactos/base/shell/explorer-new/manifest.xml (original) +++ trunk/reactos/base/shell/explorer-new/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.Application.Explorer" + name="ReactOS.Explorer" type="win32" /> -<description>ReactOS Explorer</description> +<description>ROS Explorer</description> <dependency> <dependentAssembly> <assemblyIdentity Removed: trunk/reactos/base/system/winlogon/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/manif… ============================================================================== --- trunk/reactos/base/system/winlogon/manifest.xml (original) +++ trunk/reactos/base/system/winlogon/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Logon" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Logon</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/base/system/winlogon/winlogon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rc (original) +++ trunk/reactos/base/system/winlogon/winlogon.rc Tue Jan 8 19:13:01 2008 @@ -6,9 +6,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon Application\0" #define REACTOS_STR_INTERNAL_NAME "winlogon\0" #define REACTOS_STR_ORIGINAL_FILENAME "winlogon.exe\0" - -1 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> #include "rsrc.rc" Modified: trunk/reactos/dll/cpl/access/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/access/manifest.xml (original) +++ trunk/reactos/dll/cpl/access/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Access" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Accessibility Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/appwiz/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/manifest.xml (original) +++ trunk/reactos/dll/cpl/appwiz/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.AppWiz" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Application Wizard Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/desk/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/desk/manifest.xml (original) +++ trunk/reactos/dll/cpl/desk/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Desk" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Desktop Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/hdwwiz/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/manifest.xml (original) +++ trunk/reactos/dll/cpl/hdwwiz/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.HdwWiz" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Hardware Wizard Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/input/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/input/manifest.xml (original) +++ trunk/reactos/dll/cpl/input/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Input" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Input Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/intl/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/intl/manifest.xml (original) +++ trunk/reactos/dll/cpl/intl/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Intl" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Regional Settings Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/joy/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/manifest.xml?r… ============================================================================== --- trunk/reactos/dll/cpl/joy/manifest.xml (original) +++ trunk/reactos/dll/cpl/joy/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Joy" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Joystick Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/liccpa/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/manifest.xml (original) +++ trunk/reactos/dll/cpl/liccpa/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Liccpa" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Licensing Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/main/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/main/manifest.xml (original) +++ trunk/reactos/dll/cpl/main/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Main" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Mouse Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/mmsys/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/manifest.xml (original) +++ trunk/reactos/dll/cpl/mmsys/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.MMSys" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Multimedia Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/ncpa/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/manifest.xml (original) +++ trunk/reactos/dll/cpl/ncpa/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Ncpa" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Network Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/powercfg/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/manifest.xml (original) +++ trunk/reactos/dll/cpl/powercfg/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.PowerCfg" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Power Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/telephon/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/manifest.xml (original) +++ trunk/reactos/dll/cpl/telephon/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Telephon" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Telephon Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/timedate/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/manifest.xml (original) +++ trunk/reactos/dll/cpl/timedate/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.TimeDate" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS Time-Date Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/cpl/usrmgr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/manifest.xml (original) +++ trunk/reactos/dll/cpl/usrmgr/manifest.xml Tue Jan 8 19:13:01 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.System.ControlPanel.Usrmgr" + name="ReactOS.System.ControlPanel.System" type="win32" /> - <description>ReactOS User Manager Control Panel</description> + <description>ReactOS System Control Panel</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rc (original) +++ trunk/reactos/dll/win32/aclui/aclui.rc Tue Jan 8 19:13:01 2008 @@ -6,9 +6,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Access Control List Editor\0" #define REACTOS_STR_INTERNAL_NAME "aclui\0" #define REACTOS_STR_ORIGINAL_FILENAME "aclui.dll\0" - -123 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> IDB_USRGRPIMAGES BITMAP "res/usrgrp.bmp" Removed: trunk/reactos/dll/win32/aclui/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/manifest.x… ============================================================================== --- trunk/reactos/dll/win32/aclui/manifest.xml (original) +++ trunk/reactos/dll/win32/aclui/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/win32/console/console.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rc (original) +++ trunk/reactos/dll/win32/console/console.rc Tue Jan 8 19:13:01 2008 @@ -15,9 +15,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control Panel Console Applet\0" #define REACTOS_STR_INTERNAL_NAME "console\0" #define REACTOS_STR_ORIGINAL_FILENAME "console.dll\0" - -123 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> #include "rsrc.rc" Removed: trunk/reactos/dll/win32/console/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/manifest… ============================================================================== --- trunk/reactos/dll/win32/console/manifest.xml (original) +++ trunk/reactos/dll/win32/console/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc Tue Jan 8 19:13:01 2008 @@ -9,9 +9,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Device Manager\0" #define REACTOS_STR_INTERNAL_NAME "devmgr\0" #define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll\0" - -123 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> IDI_DEVMGR ICON "resources/devmgr.ico" Removed: trunk/reactos/dll/win32/devmgr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/manifest.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/manifest.xml (original) +++ trunk/reactos/dll/win32/devmgr/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Removed: trunk/reactos/dll/win32/modemui/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/manifest… ============================================================================== --- trunk/reactos/dll/win32/modemui/manifest.xml (original) +++ trunk/reactos/dll/win32/modemui/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… ============================================================================== --- trunk/reactos/dll/win32/modemui/modemui.rc (original) +++ trunk/reactos/dll/win32/modemui/modemui.rc Tue Jan 8 19:13:01 2008 @@ -6,9 +6,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Modem Properties\0" #define REACTOS_STR_INTERNAL_NAME "modemui\0" #define REACTOS_STR_ORIGINAL_FILENAME "modemui.dll\0" - -2 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> IDI_5100 ICON "res/5100.ico" Removed: trunk/reactos/dll/win32/netid/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/manifest.x… ============================================================================== --- trunk/reactos/dll/win32/netid/manifest.xml (original) +++ trunk/reactos/dll/win32/netid/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.rc (original) +++ trunk/reactos/dll/win32/netid/netid.rc Tue Jan 8 19:13:01 2008 @@ -6,9 +6,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network ID Page\0" #define REACTOS_STR_INTERNAL_NAME "netid\0" #define REACTOS_STR_ORIGINAL_FILENAME "netid.dll\0" - -2 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> IDI_COMPNAME ICON "res/netid.ico" Removed: trunk/reactos/dll/win32/newdev/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/manifest.… ============================================================================== --- trunk/reactos/dll/win32/newdev/manifest.xml (original) +++ trunk/reactos/dll/win32/newdev/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/rsrc.rc (original) +++ trunk/reactos/dll/win32/newdev/rsrc.rc Tue Jan 8 19:13:01 2008 @@ -1,7 +1,5 @@ #include <windows.h> #include "resource.h" - -123 24 DISCARDABLE "manifest.xml" IDB_WATERMARK BITMAP "resources/watermark.bmp" IDB_HEADER BITMAP "resources/header.bmp" Modified: trunk/reactos/dll/win32/rasdlg/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/manifest.… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/manifest.xml (original) +++ trunk/reactos/dll/win32/rasdlg/manifest.xml Tue Jan 8 19:13:01 2008 @@ -6,7 +6,7 @@ name="ReactOS.System.Net.rasdlg" type="win32" /> - <description>ReactOS Ras Dialog</description> + <description>ReactOS Ras dialog</description> <dependency> <dependentAssembly> <assemblyIdentity Removed: trunk/reactos/dll/win32/shell32/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/manifest… ============================================================================== --- trunk/reactos/dll/win32/shell32/manifest.xml (original) +++ trunk/reactos/dll/win32/shell32/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32.rc Tue Jan 8 19:13:01 2008 @@ -23,8 +23,6 @@ #include "shresdef.h" #include "version.rc" - -124 24 DISCARDABLE "manifest.xml" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.rc Tue Jan 8 19:13:01 2008 @@ -7,9 +7,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Advanced display adapter properties\0" #define REACTOS_STR_INTERNAL_NAME "deskadp\0" #define REACTOS_STR_ORIGINAL_FILENAME "deskadp.dll\0" - -124 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> #include "rsrc.rc" Removed: trunk/reactos/dll/win32/shellext/deskadp/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/manifest.xml (original) +++ trunk/reactos/dll/win32/shellext/deskadp/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.rc Tue Jan 8 19:13:01 2008 @@ -7,9 +7,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Advanced display monitor properties\0" #define REACTOS_STR_INTERNAL_NAME "deskmon\0" #define REACTOS_STR_ORIGINAL_FILENAME "deskmon.dll\0" - -124 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> #include "rsrc.rc" Removed: trunk/reactos/dll/win32/shellext/deskmon/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/manifest.xml (original) +++ trunk/reactos/dll/win32/shellext/deskmon/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Removed: trunk/reactos/dll/win32/shellext/slayer/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… ============================================================================== --- trunk/reactos/dll/win32/shellext/slayer/manifest.xml (original) +++ trunk/reactos/dll/win32/shellext/slayer/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/win32/shellext/slayer/slayer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… ============================================================================== --- trunk/reactos/dll/win32/shellext/slayer/slayer.rc (original) +++ trunk/reactos/dll/win32/shellext/slayer/slayer.rc Tue Jan 8 19:13:01 2008 @@ -7,9 +7,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Compatibility Layer Shell Extension\0" #define REACTOS_STR_INTERNAL_NAME "slayer\0" #define REACTOS_STR_ORIGINAL_FILENAME "slayer.dll\0" - -123 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> #include "rsrc.rc" Removed: trunk/reactos/dll/win32/syssetup/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/manifes… ============================================================================== --- trunk/reactos/dll/win32/syssetup/manifest.xml (original) +++ trunk/reactos/dll/win32/syssetup/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.Application.Solitaire" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Solitaire</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc Tue Jan 8 19:13:01 2008 @@ -7,9 +7,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "System Setup DLL\0" #define REACTOS_STR_INTERNAL_NAME "syssetup\0" #define REACTOS_STR_ORIGINAL_FILENAME "syssetup.dll\0" - -1234 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

16 years, 10 months

[dreimer] 31671: Revert Manifest Commits due to popular demand. They will be Autogenerated by RBuild in the Future.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 8 19:12:49 2008 New Revision: 31671 URL: http://svn.reactos.org/svn/reactos?rev=31671&view=rev Log: Revert Manifest Commits due to popular demand. They will be Autogenerated by RBuild in the Future. Removed: trunk/rosapps/applications/screensavers/butterflies/manifest.xml trunk/rosapps/applications/screensavers/matrix/manifest.xml trunk/rosapps/magnify/manifest.xml Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc trunk/rosapps/applications/screensavers/matrix/rsrc.rc trunk/rosapps/imagesoft/manifest.xml trunk/rosapps/magnify/magnify.rc trunk/rosapps/old_wordpad/manifest.xml trunk/rosapps/roscalc/manifest.xml Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Tue Jan 8 19:12:49 2008 @@ -7,9 +7,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "Butterflies ScreenSaver\0" #define REACTOS_STR_INTERNAL_NAME "butterflies\0" #define REACTOS_STR_ORIGINAL_FILENAME "butterflies.scr\0" - -1 24 DISCARDABLE "manifest.xml" - #include <reactos/version.rc> IDB_BUTTERFLY1 BITMAP "res/butterfly1.bmp" Removed: trunk/rosapps/applications/screensavers/butterflies/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/manifest.xml (original) +++ trunk/rosapps/applications/screensavers/butterflies/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.Application.Butterflies" - type="win32" - /> - <description>ReactOS Butterflies Screensaver</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Removed: trunk/rosapps/applications/screensavers/matrix/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/manifest.xml (original) +++ trunk/rosapps/applications/screensavers/matrix/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.Application.Matrix" - type="win32" - /> - <description>ReactOS Matrix Screensaver</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/rosapps/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/rsrc.rc (original) +++ trunk/rosapps/applications/screensavers/matrix/rsrc.rc Tue Jan 8 19:12:49 2008 @@ -6,8 +6,6 @@ IDB_BITMAP1 BITMAP DISCARDABLE "matrix.bmp" IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" IDI_ICON1 ICON DISCARDABLE "icon1.ico" - -1 24 DISCARDABLE "manifest.xml" #include "lang/bg-BG.rc" #include "lang/de-DE.rc" Modified: trunk/rosapps/imagesoft/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/manifest.xml?rev… ============================================================================== --- trunk/rosapps/imagesoft/manifest.xml (original) +++ trunk/rosapps/imagesoft/manifest.xml Tue Jan 8 19:12:49 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.Application.ImageSoft" + name="ReactOS.VMware.SVGA.Installer" type="win32" /> - <description>ReactOS ImageSoft</description> + <description>ReactOS VMware(r) SVGA driver Installer</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/rosapps/magnify/magnify.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnify.rc?rev=316… ============================================================================== --- trunk/rosapps/magnify/magnify.rc (original) +++ trunk/rosapps/magnify/magnify.rc Tue Jan 8 19:12:49 2008 @@ -10,8 +10,6 @@ #include <reactos/version.rc> -1 24 DISCARDABLE "manifest.xml" - IDI_ICON ICON "res/magnify.ico" #include "rsrc.rc" Removed: trunk/rosapps/magnify/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/manifest.xml?rev=3… ============================================================================== --- trunk/rosapps/magnify/manifest.xml (original) +++ trunk/rosapps/magnify/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.Application.Magnify" - type="win32" - /> - <description>ReactOS Magnifier</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Modified: trunk/rosapps/old_wordpad/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/old_wordpad/manifest.xml?r… ============================================================================== --- trunk/rosapps/old_wordpad/manifest.xml (original) +++ trunk/rosapps/old_wordpad/manifest.xml Tue Jan 8 19:12:49 2008 @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="ReactOS.Application.WordPad" + name="ReactOS.VMware.SVGA.Installer" type="win32" /> - <description>ReactOS Word Pad</description> + <description>ReactOS VMware(r) SVGA driver Installer</description> <dependency> <dependentAssembly> <assemblyIdentity Modified: trunk/rosapps/roscalc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/manifest.xml?rev=3… ============================================================================== --- trunk/rosapps/roscalc/manifest.xml (original) +++ trunk/rosapps/roscalc/manifest.xml Tue Jan 8 19:12:49 2008 @@ -3,7 +3,7 @@ xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - name="ReactOS.Application.Calculator" + name="Win32 Application.default.App" processorArchitecture="x86" version="1.0.0.0" type="win32"/>

16 years, 10 months

[dreimer] 31670: Bug 2943: Ukrainian translation update

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 8 18:11:33 2008 New Revision: 31670 URL: http://svn.reactos.org/svn/reactos?rev=31670&view=rev Log: Bug 2943: Ukrainian translation update Added: trunk/rosapps/sysutils/systeminfo/lang/uk-UA.rc (with props) Modified: trunk/rosapps/sysutils/systeminfo/rsrc.rc Added: trunk/rosapps/sysutils/systeminfo/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/u… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/uk-UA.rc (added) +++ trunk/rosapps/sysutils/systeminfo/lang/uk-UA.rc Tue Jan 8 18:11:33 2008 @@ -1,0 +1,72 @@ +/* + * PROJECT: System Information + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/sysutils/systeminfo/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for systeminfo + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "SYSTEMINFO [/S ñèñòåìà [/U êîðèñòóâà÷ [/P [ïàðîëü]]]] [/FO ôîðìàò] [/NH]\n\n\ +Îïèñ:\n\ + Öåé ³íñòðóìåíò êîìàíäíîãî ðÿäêà íàäàº àäì³í³ñòðàòîðîâ³ ìîæëèâ³ñòü\n\ + çàïèòàòè îñíîâíó ³íôîðìàö³þ ïðî êîíô³ãóðàö³þ ñèñòåìè.\n\n\ +Ñïèñîê ïàðàìåòð³â:\n\ + /S ñèñòåìà Âèçíà÷àº â³ääàëåíó ñèñòåìó äëÿ ç'ºäíàííÿ.\n\n\ + /U [äîìåí\\]êîðèñò. Âèçíà÷àº êîíòåêñò êîðèñòóâà÷à, â ÿêîìó ìàº\n\ + âèêîíóâàòèñÿ öÿ êîìàíäà.\n\n\ + /P [ïàðîëü] Âèçíà÷àº ïàðîëü äëÿ öüîãî êîðèñòóâàöüêîãî êîíòåêñòó.\n\ + Çàïðîøóº ââåäåííÿ ïàðîëÿ, ÿêùî â³í íå çàäàíèé.\n\n\ + /FO ôîðìàò Âèçíà÷àº ôîðìàò, â ÿêîìó â³äîáðàæàþòüñÿ\n\ + âèõ³äí³ äàí³.\n\ + Äîïóñòèì³ ôîðìàòè: \"TABLE\", \"LIST\", \"CSV\".\n\n\ + /NH Íå â³äîáðàæàòè çàãîëîâêè ñòîâïö³â\n\ + âèõ³äíèõ äàíèõ.\n\ + Äîïóñêàºòüñÿ äëÿ ôîðìàò³â \"TABLE\" and \"CSV\".\n\n\ + /? Ïîêàçóº öþ äîâ³äêó.\n\n\ +Ïðèêëàäè:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S ñèñòåìà\n\ + SYSTEMINFO /S ñèñòåìà /U user\n\ + SYSTEMINFO /S ñèñòåìà /U äîìåí\\êîðèñòóâà÷ /P ïàðîëü /FO TABLE\n\ + SYSTEMINFO /S ñèñòåìà /FO LIST\n\ + SYSTEMINFO /S ñèñòåìà /FO CSV /NH\n" + +IDS_OS_NAME, "²ì'ÿ ÎÑ: %s\n" +IDS_OS_VERSION, "Âåðñ³ÿ ÎÑ: %d.%d.%d %s" +IDS_OS_BUILD, " Çá³ðêà %s\n" +IDS_OS_BUILD_TYPE, "Òèï çá³ðêè ÎÑ: %s\n" +IDS_REG_OWNER, "Çàðåºñòðîâàíèé âëàñíèê: %s\n" +IDS_REG_ORG, "Çàðåºñòðîâàíà îðãàí³çàö³ÿ: %s\n" +IDS_PRODUCT_ID, "ID ïðîäóêòà: %s\n" +IDS_INST_DATE, "Äàòà óñòàíîâêè: %s, " +IDS_INST_TIME, "%s\n" +IDS_SYS_TYPE_UNKNOWN, "Òèï ñèñòåìè: Íåâ³äîìà\n" +IDS_SYS_TYPE_X86, "Òèï ñèñòåìè: X86-based PC\n" +IDS_SYS_TYPE_IA64, "Òèï ñèñòåìè: IA64-based PC\n" +IDS_SYS_TYPE_AMD64, "Òèï ñèñòåìè: AMD64-based PC\n" +IDS_PROCESSORS, "Ïðîöåñîð(è): %u ïðîöåñîð(à,³â) âñòàíîâëåíî.\n" +IDS_ROS_DIR, "Ïàïêà ReactOS: %s\n" +IDS_SYS_DIR, "Ñèñòåìíà ïàïêà: %s\n" +IDS_BOOT_DEV, "Ïðèñòð³é çàâàíòàæåííÿ: %s\n" +IDS_SYS_LOCALE, "Ìîâà ñèñòåìè: %s\n" +IDS_INPUT_LOCALE, "Ìîâà ââîäó: %s\n" +IDS_TOTAL_PHYS_MEM, "Âñüîãî ô³çè÷íî¿ ïàì'ÿò³: %ld ÌÁ (%ld ÊÁ)\n" +IDS_AVAIL_PHISICAL_MEM, "Äîñòóïíî ô³çè÷íî¿ ïàì'ÿò³: %ld ÌÁ (%ld ÊÁ)\n" +IDS_VIRT_MEM_MAX, "Â³ðòóàëüíà ïàì'ÿòü: Ìàêñ. ðîçì³ð: %ld ÌÁ (%ld ÊÁ)\n" +IDS_VIRT_MEM_AVAIL, "Â³ðòóàëüíà ïàì'ÿòü: Äîñòóïíî: %ld ÌÁ (%ld ÊÁ)\n" +IDS_VIRT_MEM_INUSE, "Â³ðòóàëüíà ïàì'ÿòü: Âèêîðèñò.: %ld ÌÁ (%ld ÊÁ)\n" +IDS_HOST_NAME, "²ì'ÿ êîìï'þòåðà: %s\n" +IDS_PAGEFILE_LOC, "Ðîçòàøóâàííÿ ôàéëó äîâàíòàæåííÿ %s\n" +IDS_TIME_ZONE, "×àñîâèé ïîÿñ: %s\n" +IDS_DOMINE, "Äîìåí: %s\n" +IDS_BIOS_DATE, "Äàòà BIOS: %s\n" +IDS_BIOS_VERSION, "Âåðñ³ÿ BIOS: %s\n" +IDS_NETWORK_CARDS, "Ìåðåæíà êàðòà(è) %u Installed.\n" + +END Propchange: trunk/rosapps/sysutils/systeminfo/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/sysutils/systeminfo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/rsrc.r… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/rsrc.rc (original) +++ trunk/rosapps/sysutils/systeminfo/rsrc.rc Tue Jan 8 18:11:33 2008 @@ -5,3 +5,4 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/es-ES.rc" +#include "lang/uk-UA.rc"

16 years, 10 months

[dreimer] 31669: Bug 2943: Ukrainian translation update

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 8 18:11:29 2008 New Revision: 31669 URL: http://svn.reactos.org/svn/reactos?rev=31669&view=rev Log: Bug 2943: Ukrainian translation update Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc Tue Jan 8 18:11:29 2008 @@ -703,7 +703,7 @@ COMBOBOX 1551, 16, 169, 128, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "&Íàëàøòóâàòè...", 1293, 150, 168, 60, 14 PUSHBUTTON "&X.25", 1295, 7, 194, 50, 14 - PUSHBUTTON "Â&³ðòóàëüíå òóíåëüíå ï³äêëþ÷åíí", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "Â&³ðòóàëüíå òóíåëüíå ï³äêëþ÷åííÿ", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED END 168 DIALOG 0, 0, 317, 143

16 years, 10 months

← Newer
1
...
37
38
39
40
41
42
43
...
54
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 January 2008