Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[spetreolle] 32042: Added notepad to readme.wine
by spetreolle＠svn.reactos.org 29 Jan '08

29 Jan '08

Author: spetreolle Date: Tue Jan 29 21:02:14 2008 New Revision: 32042 URL: http://svn.reactos.org/svn/reactos?rev=32042&view=rev Log: Added notepad to readme.wine Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Tue Jan 29 21:02:14 2008 @@ -106,6 +106,7 @@ reactos/base/applications/winhelp # Synced to Wine-0_9_53 reactos/base/applications/wordpad # Synced to Wine-0_9_53 reactos/modules/rosapps/winefile # Synced to Wine-0_9_53 +reactos/base/applications/notepad # Forked at Wine-20041201 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[dreimer] 32041: Bug 3014: DLL-Win32-Shellext translation patch by Olaf Sjeka
by dreimer＠svn.reactos.org 29 Jan '08

29 Jan '08

Author: dreimer Date: Tue Jan 29 17:36:49 2008 New Revision: 32041 URL: http://svn.reactos.org/svn/reactos?rev=32041&view=rev Log: Bug 3014: DLL-Win32-Shellext translation patch by Olaf Sjeka Added: trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc (with props) trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc (with props) Modified: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Added: trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc Tue Jan 29 17:36:49 2008 @@ -1,0 +1,54 @@ +/* translated by Caemyr - Olaf Siejka (Jan, 2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Karta GPU" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Typ karty", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&W³aciwoci", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Informacje o karcie", -1, 7, 56, 237, 75 + LTEXT "Typ GPU:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "Typ DAC:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Rozmiar pamiêci:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Ci¹g nazwy:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "Wersja BIOS:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "&Wywietl wszystkie tryby...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Wywietlanie trybów" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Anuluj", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Wywietl tylko obs³ugiwane tryby", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "Odwie¿anie domylne" + IDES_REFRESHRATEFMT "%d Herców" + IDS_4BPP "16 kolorów" + IDS_8BPP "256 kolorów" + IDS_15BPP "32k kolorów (15 bitów)" + IDS_16BPP "64k kolorów (16 bitów)" + IDS_24BPP "16m kolorów (24 bity)" + IDS_32BPP "16m +kana³ alfa (32 bity)" +END + Propchange: trunk/reactos/dll/win32/shellext/deskadp/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc Tue Jan 29 17:36:49 2008 @@ -7,7 +7,8 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" -#include "lang/ru-RU.rc" -#include "lang/it-IT.rc" Added: trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc Tue Jan 29 17:36:49 2008 @@ -1,0 +1,28 @@ +/* translated by Caemyr - Olaf Siejka (Jan, 2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monitor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Typ monitora", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "&W³aciwoci", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Ustawienia monitora", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&Czêstotliwoæi odwie¿ania ekranu:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "&Ukryj tryby których monitor n\ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "U¿yj domylnych ustawieñ sprzêtu" + IDS_FREQFMT "%u Herców" +END Propchange: trunk/reactos/dll/win32/shellext/deskmon/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Tue Jan 29 17:36:49 2008 @@ -7,7 +7,8 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" #include "lang/sk-SK.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/uk-UA.rc" -#include "lang/it-IT.rc" -#include "lang/ru-RU.rc"

1 0

[fireball] 32040: - Fix a typo in the if branch, which resulted in marking almost all memory above the bootloader as "FirmwareTemporary", even reserved ACPI pages. This should fix the ACPI BSOD Windows 2003 and XP show up. - If a memory is marked as "free", leave it so, without transferring to FirmwareTemporary.
by fireball＠svn.reactos.org 29 Jan '08

29 Jan '08

Author: fireball Date: Tue Jan 29 13:08:18 2008 New Revision: 32040 URL: http://svn.reactos.org/svn/reactos?rev=32040&view=rev Log: - Fix a typo in the if branch, which resulted in marking almost all memory above the bootloader as "FirmwareTemporary", even reserved ACPI pages. This should fix the ACPI BSOD Windows 2003 and XP show up. - If a memory is marked as "free", leave it so, without transferring to FirmwareTemporary. Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Tue Jan 29 13:08:18 2008 @@ -363,9 +363,12 @@ // if (BasePage + PageCount > LOADER_HIGH_ZONE) { - if (Mad[MadCount].MemoryType != LoaderSpecialMemory || - Mad[MadCount].MemoryType != LoaderFirmwarePermanent) - { + if (Mad[MadCount].MemoryType != LoaderSpecialMemory && + Mad[MadCount].MemoryType != LoaderFirmwarePermanent && + Mad[MadCount].MemoryType != LoaderFree) + { + DbgPrint((DPRINT_WINDOWS, "Setting page %x %x to Temporary from %d\n", + BasePage, PageCount, Mad[MadCount].MemoryType)); Mad[MadCount].MemoryType = LoaderFirmwareTemporary; } @@ -466,7 +469,7 @@ // 2) Memory descriptors must map *the whole* physical memory // showing any memory above 16/24/32 as FirmwareTemporary // - // 3) Overall memory blocks count must not exceed 30 + // 3) Overall memory blocks count must not exceed 30 (?? why?) // //

1 0

[fireball] 32039: - Fix an incorrect type of memory behind PDE, HAL mapping and kernel segment pagetables. They should be MemoryData. (and change allocation algorithm slightly). - With this change Windows 2003 boots up to the BSOD showing ACPI_BIOS_ERROR.
by fireball＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: fireball Date: Mon Jan 28 21:50:29 2008 New Revision: 32039 URL: http://svn.reactos.org/svn/reactos?rev=32039&view=rev Log: - Fix an incorrect type of memory behind PDE, HAL mapping and kernel segment pagetables. They should be MemoryData. (and change allocation algorithm slightly). - With this change Windows 2003 boots up to the BSOD showing ACPI_BIOS_ERROR. Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Mon Jan 28 21:50:29 2008 @@ -129,11 +129,23 @@ // Allocate memory block for all these things: // PDE, HAL mapping page table, physical mapping, kernel mapping - // FIXME: PDE+HAL+KernelPTEs == FirmwarePermanent, Physical PTEs = FirmwareTemporary TotalSize = (1+1+NumPageTables*2)*MM_PAGE_SIZE; - Buffer = MmAllocateMemoryWithType(TotalSize, LoaderFirmwarePermanent); - - if (Buffer == NULL) + + // Physical PTEs = FirmwareTemporary + PhysicalPageTablesBuffer = MmAllocateMemoryWithType( + NumPageTables*MM_PAGE_SIZE, LoaderFirmwareTemporary); + + // PDE+HAL+KernelPTEs == MemoryData + Buffer = MmAllocateMemoryWithType( + TotalSize - NumPageTables*MM_PAGE_SIZE, LoaderMemoryData); + + if (Buffer + (TotalSize - NumPageTables*MM_PAGE_SIZE) != + PhysicalPageTablesBuffer) + { + DbgPrint((DPRINT_WINDOWS, "There was a problem allocating two adjacent blocks of memory!")); + } + + if (Buffer == NULL || PhysicalPageTablesBuffer == NULL) { UiMessageBox("Impossible to allocate memory block for page tables!"); return FALSE; @@ -158,12 +170,8 @@ PDE[1023].Valid = 1; PDE[1023].Write = 1; - // Store pointers to the tables for easier access - PhysicalPageTablesBuffer = &Buffer[MM_PAGE_SIZE*2]; - KernelPageTablesBuffer = PhysicalPageTablesBuffer + NumPageTables*MM_PAGE_SIZE; - - // Mark physical PTE's buffer as FirmwareTemporary - //MmSetMemoryType(KernelPageTablesBuffer, NumPageTables*MM_PAGE_SIZE, LoaderFirmwareTemporary); + // Store pointer to the table for easier access + KernelPageTablesBuffer = &Buffer[MM_PAGE_SIZE*2]; // Zero counters of page tables used PhysicalPageTables = 0;

1 0

[spetreolle] 32038: forgot that one
by spetreolle＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: spetreolle Date: Mon Jan 28 21:05:54 2008 New Revision: 32038 URL: http://svn.reactos.org/svn/reactos?rev=32038&view=rev Log: forgot that one Modified: trunk/reactos/base/applications/wordpad/print.c Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c (original) +++ trunk/reactos/base/applications/wordpad/print.c Mon Jan 28 21:05:54 2008 @@ -185,7 +185,7 @@ if(wordWrap == ID_WORDWRAP_MARGIN) { RECT rc = get_print_rect(hdc); - width = rc.right; + width = rc.right - rc.left; } if(!hdc)

1 0

[spetreolle] 32037: apply missing part of wordpad manual winesync
by spetreolle＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: spetreolle Date: Mon Jan 28 20:51:00 2008 New Revision: 32037 URL: http://svn.reactos.org/svn/reactos?rev=32037&view=rev Log: apply missing part of wordpad manual winesync Modified: trunk/reactos/base/applications/wordpad/print.c Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c (original) +++ trunk/reactos/base/applications/wordpad/print.c Mon Jan 28 20:51:00 2008 @@ -1,7 +1,7 @@ /* * Wordpad implementation - Printing and print preview functions * - * Copyright 2007 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> + * Copyright 2007-2008 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -130,23 +130,23 @@ static LONG twips_to_centmm(int twips) { - return MulDiv(twips, 1000, 567); + return MulDiv(twips, 1000, TWIPS_PER_CM); } LONG centmm_to_twips(int mm) { - return MulDiv(mm, 567, 1000); + return MulDiv(mm, TWIPS_PER_CM, 1000); } static LONG twips_to_pixels(int twips, int dpi) { - float ret = ((float)twips / ((float)567 * 2.54)) * (float)dpi; + float ret = ((float)twips / ((float)TWIPS_PER_CM * 2.54)) * (float)dpi; return (LONG)ret; } static LONG devunits_to_twips(int units, int dpi) { - float ret = ((float)units / (float)dpi) * (float)567 * 2.54; + float ret = ((float)units / (float)dpi) * (float)TWIPS_PER_CM * 2.54; return (LONG)ret; } @@ -252,6 +252,25 @@ fr->chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)fr); } +} + +static HWND get_ruler_wnd(HWND hMainWnd) +{ + return GetDlgItem(GetDlgItem(hMainWnd, IDC_REBAR), IDC_RULER); +} + +void redraw_ruler(HWND hRulerWnd) +{ + RECT rc; + + GetClientRect(hRulerWnd, &rc); + InvalidateRect(hRulerWnd, &rc, TRUE); +} + +static void update_ruler(HWND hRulerWnd) +{ + SendMessageW(hRulerWnd, WM_USER, 0, 0); + redraw_ruler(hRulerWnd); } static void print(LPPRINTDLGW pd, LPWSTR wszFileName) @@ -340,6 +359,7 @@ margins.bottom = centmm_to_twips(ps.rtMargin.bottom); devMode = ps.hDevMode; devNames = ps.hDevNames; + update_ruler(get_ruler_wnd(hMainWnd)); } } @@ -394,6 +414,7 @@ devMode = pd.hDevMode; devNames = pd.hDevNames; print(&pd, wszFileName); + update_ruler(get_ruler_wnd(hMainWnd)); } } @@ -454,6 +475,145 @@ BOOL preview_isactive(void) { return preview.page != 0; +} + +static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, long EditLeftmost) +{ + static HDC hdc; + + if(NewMetrics) + { + static HBITMAP hBitmap; + int i, x, y, RulerTextEnd; + int CmPixels; + int QuarterCmPixels; + HFONT hFont; + WCHAR FontName[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0}; + + if(hdc) + { + DeleteDC(hdc); + DeleteObject(hBitmap); + } + + hdc = CreateCompatibleDC(hdc); + + CmPixels = twips_to_pixels(TWIPS_PER_CM, GetDeviceCaps(hdc, LOGPIXELSX)); + QuarterCmPixels = (int)((float)CmPixels / 4.0); + + hBitmap = CreateCompatibleBitmap(hdc, drawRect->right, drawRect->bottom); + SelectObject(hdc, hBitmap); + FillRect(hdc, drawRect, GetStockObject(WHITE_BRUSH)); + + hFont = CreateFontW(10, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FontName); + + SelectObject(hdc, hFont); + SetBkMode(hdc, TRANSPARENT); + SetTextAlign(hdc, TA_CENTER); + y = (int)(((float)drawRect->bottom - (float)drawRect->top) / 2.0) + 1; + RulerTextEnd = drawRect->right - EditLeftmost + 1; + for(i = 1, x = EditLeftmost; x < (drawRect->right - EditLeftmost + 1); i ++) + { + WCHAR str[3]; + WCHAR format[] = {'%','d',0}; + int x2 = x; + + x2 += QuarterCmPixels; + if(x2 > RulerTextEnd) + break; + + MoveToEx(hdc, x2, y, NULL); + LineTo(hdc, x2, y+2); + + x2 += QuarterCmPixels; + if(x2 > RulerTextEnd) + break; + + MoveToEx(hdc, x2, y - 3, NULL); + LineTo(hdc, x2, y + 3); + + x2 += QuarterCmPixels; + if(x2 > RulerTextEnd) + break; + + MoveToEx(hdc, x2, y, NULL); + LineTo(hdc, x2, y+2); + + x += CmPixels; + if(x > RulerTextEnd) + break; + + wsprintfW(str, format, i); + TextOutW(hdc, x, 5, str, lstrlenW(str)); + } + DeleteObject(hFont); + } + + BitBlt(hdcRuler, 0, 0, drawRect->right, drawRect->bottom, hdc, 0, 0, SRCAND); +} + +static void paint_ruler(HWND hWnd, long EditLeftmost, BOOL NewMetrics) +{ + PAINTSTRUCT ps; + HDC hdc = BeginPaint(hWnd, &ps); + HDC hdcPrint = make_dc(); + RECT printRect = get_print_rect(hdcPrint); + RECT drawRect; + HBRUSH hBrush = CreateSolidBrush(GetSysColor(COLOR_MENU)); + + GetClientRect(hWnd, &drawRect); + FillRect(hdc, &drawRect, hBrush); + + drawRect.top += 3; + drawRect.bottom -= 3; + drawRect.left = EditLeftmost; + drawRect.right = twips_to_pixels(printRect.right - margins.left, GetDeviceCaps(hdc, LOGPIXELSX)); + FillRect(hdc, &drawRect, GetStockObject(WHITE_BRUSH)); + + drawRect.top--; + drawRect.bottom++; + DrawEdge(hdc, &drawRect, EDGE_SUNKEN, BF_RECT); + + drawRect.left = drawRect.right - 1; + drawRect.right = twips_to_pixels(printRect.right + margins.right - margins.left, GetDeviceCaps(hdc, LOGPIXELSX)); + DrawEdge(hdc, &drawRect, EDGE_ETCHED, BF_RECT); + + drawRect.left = 0; + drawRect.top = 0; + add_ruler_units(hdc, &drawRect, NewMetrics, EditLeftmost); + + SelectObject(hdc, GetStockObject(BLACK_BRUSH)); + DeleteObject(hBrush); + DeleteDC(hdcPrint); + EndPaint(hWnd, &ps); +} + +LRESULT CALLBACK ruler_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static WNDPROC pPrevRulerProc; + static long EditLeftmost; + static BOOL NewMetrics; + + switch(msg) + { + case WM_USER: + if(wParam) + { + EditLeftmost = ((POINTL*)wParam)->x; + pPrevRulerProc = (WNDPROC)lParam; + } + NewMetrics = TRUE; + break; + + case WM_PAINT: + paint_ruler(hWnd, EditLeftmost, NewMetrics); + break; + + default: + return CallWindowProcW(pPrevRulerProc, hWnd, msg, wParam, lParam); + } + + return 0; } LRESULT print_preview(HWND hMainWnd)

1 0

[dreimer] 32036: Update translations of wordpad by syncin to wine 0.9.54
by dreimer＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: dreimer Date: Mon Jan 28 18:08:37 2008 New Revision: 32036 URL: http://svn.reactos.org/svn/reactos?rev=32036&view=rev Log: Update translations of wordpad by syncin to wine 0.9.54 Modified: trunk/reactos/base/applications/winhelp/hlpfile.c trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/wordpad/wordpad.h Modified: trunk/reactos/base/applications/winhelp/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/hlpfile.c (original) +++ trunk/reactos/base/applications/winhelp/hlpfile.c Mon Jan 28 18:08:37 2008 @@ -119,7 +119,7 @@ * As of today, we only return the page... we should also return * a paragraph, and then, while opening a new page, compute the * y-offset of the paragraph to be shown and scroll the window - * accordinly + * accordingly */ /****************************************************************** * HLPFILE_PageByOffset Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc (original) +++ trunk/reactos/base/applications/wordpad/De.rc Mon Jan 28 18:08:37 2008 @@ -22,31 +22,31 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Neu\tCtrl+N", ID_FILE_NEW - MENUITEM "&Öffnen...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Speichern\tCtrl+S", ID_FILE_SAVE - MENUITEM "Speichern &unter...", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Print . . .\tCtrl+P", ID_PRINT - MENUITEM "Print previe&w . . .", ID_PREVIEW - MENUITEM "Pag&e setup . . .", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "&Beenden", ID_FILE_EXIT + MENUITEM "&Neu\tStrg+N", ID_FILE_NEW + MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN + MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE + MENUITEM "Speichern &unter...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Drucken...\tStrg+P", ID_PRINT + MENUITEM "Seitenansi&cht", ID_PREVIEW + MENUITEM "Seite ein&richten...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Beenden", ID_FILE_EXIT END POPUP "&Bearbeiten" BEGIN - MENUITEM "Rü&ckgängig\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&Wiederholen\tCtrl+Y", ID_EDIT_REDO - MENUITEM SEPARATOR - MENUITEM "Aus&schneiden\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Kopieren\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Einfügen\tCtrl+V", ID_EDIT_PASTE - MENUITEM "&Löschen\tDEL", ID_EDIT_CLEAR - MENUITEM "&Alles markieren\tCtrl+A", ID_EDIT_SELECTALL - MENUITEM SEPARATOR - MENUITEM "&Find . . .\tCrtl+F", ID_FIND - MENUITEM "Find &next\tF3", ID_FIND_NEXT - MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Rückgängig\tStrg+Z", ID_EDIT_UNDO + MENUITEM "&Wiederholen\tStrg+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Ausschneiden\tStrg+X", ID_EDIT_CUT + MENUITEM "&Kopieren\tStrg+C", ID_EDIT_COPY + MENUITEM "&Einfügen\tStrg+V", ID_EDIT_PASTE + MENUITEM "&Löschen\tEntf", ID_EDIT_CLEAR + MENUITEM "Alles &markieren\tStrg+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&Suchen...\tStrg+F", ID_FIND + MENUITEM "&Weitersuchen\tF3", ID_FIND_NEXT + MENUITEM "Erset&zen...\tStrg+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "Schreibgeschü&tzt", ID_EDIT_READONLY MENUITEM "&Geändert", ID_EDIT_MODIFIED @@ -60,33 +60,34 @@ MENUITEM "&Get text", ID_EDIT_GETTEXT END END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR - MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR - MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Options . . .", ID_VIEWPROPERTIES - END - POPUP "&Insert" - BEGIN - MENUITEM "&Date and time . . .", ID_DATETIME - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Font . . .", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT - MENUITEM "&Tabs . . ." ID_TABSTOPS + POPUP "&Ansicht" + BEGIN + MENUITEM "&Symbolleiste", ID_TOGGLE_TOOLBAR + MENUITEM "&Formatierungsleiste", ID_TOGGLE_FORMATBAR + MENUITEM "L&ineal", ID_TOGGLE_RULER + MENUITEM "Status&leiste", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Optionen...", ID_VIEWPROPERTIES + END + POPUP "&Einfügen" + BEGIN + MENUITEM "&Datum und Uhrzeit...", ID_DATETIME + END + POPUP "Forma&t" + BEGIN + MENUITEM "Sch&riftart...", ID_FONTSETTINGS + MENUITEM "Auf&zählungszeichen" ID_BULLET + MENUITEM "&Absatz..." ID_PARAFORMAT + MENUITEM "&Tabsstopps..." ID_TABSTOPS POPUP "&Hintergrund" BEGIN - MENUITEM "&System\tCtrl+1", ID_BACK_1 - MENUITEM "&PostIt-Notiz\tCtrl+2", ID_BACK_2 + MENUITEM "&System\tStrg+1", ID_BACK_1 + MENUITEM "&PostIt-Notiz\tStrg+2", ID_BACK_2 END END - POPUP "&Help" - BEGIN - MENUITEM "&About Wine Wordpad" ID_ABOUT + POPUP "&?" + BEGIN + MENUITEM "Ü&ber Wine Wordpad" ID_ABOUT END END @@ -98,63 +99,63 @@ MENUITEM "&Kopieren", ID_EDIT_COPY MENUITEM "&Einfügen", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT + MENUITEM "Auf&zählungszeichen" ID_BULLET + MENUITEM "&Absatz..." ID_PARAFORMAT END END IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Date and time" +CAPTION "Datum und Uhrzeit" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Available formats",0,3,2,100,15 + LTEXT "Verfügbare Formate",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 + PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12 END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "New" +CAPTION "Neu" FONT 10, "MS Sans Serif" BEGIN - LTEXT "New document type",0,3,2,100,15 + LTEXT "Neuer Dokumenttyp",0,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 + PUSHBUTTON "A&bbrechen",IDCANCEL,97,26,40,12 END IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Paragraph format" +Caption "Absatz" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Left", 0, 15, 22, 40, 13 + GROUPBOX "Einzug", 0, 10, 10, 120, 68 + LTEXT "Links", 0, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", 0, 15, 40, 40, 13 + LTEXT "Rechts", 0, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", 0, 15, 58, 40, 13 + LTEXT "Erste Zeile", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", 0, 15, 87, 40, 13 + LTEXT "Ausrichtung", 0, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Tabs" +Caption "Tabstopps" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tab stops", 0, 10, 10, 120, 90 + GROUPBOX "Tabstoppposition", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 + DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15 PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15 + PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "&Alle löschen", ID_TAB_EMPTY, 137, 51, 50, 15 END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -162,56 +163,57 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 - GROUPBOX "Toolbars", 0, 150, 10, 120, 85 - CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + GROUPBOX "Zeilenumbruch", 0, 10, 10, 130, 85 + RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX "Symbolleisten", 0, 150, 10, 120, 85 + CHECKBOX "&Symbolleiste", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "&Formatierungsleiste", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "L&ineal", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "Status&leiste", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich-Text-Format (*.rtf)" - STRING_TEXT_FILES_TXT, "Textdateien (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)" + STRING_RICHTEXT_FILES_RTF, "RTF-Format (*.rtf)" + STRING_TEXT_FILES_TXT, "Textdokumente (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode-Textdokumente (*.txt)" STRING_ALL_FILES, "Alle Dokumente (*.*)" END STRINGTABLE DISCARDABLE BEGIN - STRING_ALIGN_LEFT, "Left" - STRING_ALIGN_RIGHT, "Right" - STRING_ALIGN_CENTER, "Center" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Rich text document" - STRING_NEWFILE_TXT, "Text document" - STRING_NEWFILE_TXT_UNICODE, "Unicode text document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_VIEWPROPS_TITLE, "Options" + STRING_ALIGN_LEFT, "Links" + STRING_ALIGN_RIGHT, "Rechts" + STRING_ALIGN_CENTER, "Zentriert" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "RTF-Dokument" + STRING_NEWFILE_TXT, "Textdokument" + STRING_NEWFILE_TXT_UNICODE, "Unicode-Textdokument" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Druckerdateien (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Optionen" STRING_VIEWPROPS_TEXT, "Text" - STRING_VIEWPROPS_RICHTEXT, "Rich text" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PREVIEW_PRINT, "Print" - STRING_PREVIEW_NEXTPAGE, "Next page" - STRING_PREVIEW_PREVPAGE, "Previous page" - STRING_PREVIEW_CLOSE, "Close" + STRING_VIEWPROPS_RICHTEXT, "Rich Text" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "&Drucken" + STRING_PREVIEW_NEXTPAGE, "&Nächste" + STRING_PREVIEW_PREVPAGE, "&Vorherige" + STRING_PREVIEW_CLOSE, "&Schließen" END STRINGTABLE DISCARDABLE @@ -221,13 +223,13 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" - STRING_SEARCH_FINISHED, "Finished searching the document." - STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" - STRING_INVALID_NUMBER, "Invalid number format" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" -END + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Änderungen an '%s' speichern?" + STRING_SEARCH_FINISHED, "Wordpad hat das Durchsuchen des Dokuments beendet." + STRING_LOAD_RICHED_FAILED, "Die RichEdit-Bibliothek konnte nicht geladen werden." + STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. " \ + "Dadurch geht die Formatierung verloren. " \ + "Möchten Sie den Vorgang trotzdem fortsetzen?" + STRING_INVALID_NUMBER, "Diese Maßeinheit ist nicht zulässig." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstützt." +END Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/En.rc (original) +++ trunk/reactos/base/applications/wordpad/En.rc Mon Jan 28 18:08:37 2008 @@ -64,6 +64,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc Mon Jan 28 18:08:37 2008 @@ -64,6 +64,7 @@ BEGIN MENUITEM "&Barre d'outils", ID_TOGGLE_TOOLBAR MENUITEM "&Barre de format", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Barre d'état", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options...", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Barres d'outils", 0, 150, 10, 120, 85 CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc Mon Jan 28 18:08:37 2008 @@ -64,6 +64,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc Mon Jan 28 18:08:37 2008 @@ -66,6 +66,7 @@ BEGIN MENUITEM "µµ±¸¹Ù(&T)", ID_TOGGLE_TOOLBAR MENUITEM "Çü½Ä¹Ù(&F)", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "»óÅÂ¹Ù(&S)", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM " ¿É¼Ç(&O) . . .", ID_VIEWPROPERTIES @@ -170,7 +171,8 @@ GROUPBOX " µµ±¸¹Ù", 0, 150, 10, 120, 85 CHECKBOX "µµ±¸¹Ù(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "Çü½Ä¹Ù(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "»óÅÂ¹Ù(&S)", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "»óÅÂ¹Ù(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc Mon Jan 28 18:08:37 2008 @@ -64,6 +64,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc (original) +++ trunk/reactos/base/applications/wordpad/No.rc Mon Jan 28 18:08:37 2008 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 by Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2006-2008 by Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -64,6 +64,7 @@ BEGIN MENUITEM "Verk&tøylinje", ID_TOGGLE_TOOLBAR MENUITEM "&Formatlinje", ID_TOGGLE_FORMATBAR + MENUITEM "&Linjal", ID_TOGGLE_RULER MENUITEM "&Statuslinje", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Alternativer . . .", ID_VIEWPROPERTIES @@ -168,7 +169,8 @@ GROUPBOX "Verktøylinjer", 0, 150, 10, 120, 85 CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statuslinje", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Linjal", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statuslinje", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pl.rc (original) +++ trunk/reactos/base/applications/wordpad/Pl.rc Mon Jan 28 18:08:37 2008 @@ -65,6 +65,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -169,7 +170,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc Mon Jan 28 18:08:37 2008 @@ -27,11 +27,11 @@ MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE MENUITEM "Ñîõðàíèòü &êàê...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Ïå÷àòü . . .\tCtrl+P", ID_PRINT + MENUITEM "&Ïå÷àòü . . .\tCtrl+P", ID_PRINT MENUITEM "Ïðåä&âàðèòåëüíûé ïðîñìîòð . . .", ID_PREVIEW - MENUITEM "&Ìàêåò ñòðàíèöû . . .", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "Â&ûõîä", ID_FILE_EXIT + MENUITEM "&Ìàêåò ñòðàíèöû . . .", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "Â&ûõîä", ID_FILE_EXIT END POPUP "&Ïðàâêà" BEGIN @@ -41,11 +41,11 @@ MENUITEM SEPARATOR MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "&Íàéòè . . .\tCrtl+F", ID_FIND - MENUITEM "Íà&éòè äàëåå\tF3", ID_FIND_NEXT - MENUITEM "&Çàìåíèòü . . .\tCtrl+H", ID_REPLACE + MENUITEM "&Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Íàéòè . . .\tCrtl+F", ID_FIND + MENUITEM "Íà&éòè äàëåå\tF3", ID_FIND_NEXT + MENUITEM "&Çàìåíèòü . . .\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "&Òîëüêî äëÿ ÷òåíèÿ", ID_EDIT_READONLY MENUITEM "&Èçìåíåí", ID_EDIT_MODIFIED @@ -59,24 +59,25 @@ MENUITEM "Ï&îëó÷èòü òåêñò", ID_EDIT_GETTEXT END END - POPUP "&View" - BEGIN - MENUITEM "Ïàíåëü &èíñòðóìåíòîâ", ID_TOGGLE_TOOLBAR - MENUITEM "Ï&àíåëü ôîðìàòèðîâàíèÿ", ID_TOGGLE_FORMATBAR - MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_TOGGLE_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Ïàðàìåòðû . . .", ID_VIEWPROPERTIES + POPUP "&Âèä" + BEGIN + MENUITEM "Ïàíåëü &èíñòðóìåíòîâ", ID_TOGGLE_TOOLBAR + MENUITEM "Ï&àíåëü ôîðìàòèðîâàíèÿ", ID_TOGGLE_FORMATBAR + MENUITEM "&Ëèíåéêà", ID_TOGGLE_RULER + MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Ïàðàìåòðû . . .", ID_VIEWPROPERTIES END POPUP "Âñò&àâêà" BEGIN - MENUITEM "&Äàòà è âðåìÿ . . .", ID_DATETIME + MENUITEM "&Äàòà è âðåìÿ . . .", ID_DATETIME END POPUP "Ôîð&ìàò" BEGIN - MENUITEM "&Øðèôò . . .", ID_FONTSETTINGS - MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö . . ." ID_PARAFORMAT - MENUITEM "&Òàáóëÿöèÿ . . ." ID_TABSTOPS + MENUITEM "&Øðèôò . . .", ID_FONTSETTINGS + MENUITEM "&Ìàðêåð" ID_BULLET + MENUITEM "&Àáçàö . . ." ID_PARAFORMAT + MENUITEM "&Òàáóëÿöèÿ . . ." ID_TABSTOPS POPUP "&Ôîí" BEGIN MENUITEM "&Ñèñòåìíûé\tCtrl+1", ID_BACK_1 @@ -95,10 +96,10 @@ BEGIN MENUITEM "&Âûðåçàòü\tCtrl+X", ID_EDIT_CUT MENUITEM "&Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY - MENUITEM "Âñò&àâèòü", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "&Ìàðêåð" ID_BULLET - MENUITEM "&Àáçàö . . ." ID_PARAFORMAT + MENUITEM "Âñò&àâèòü", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Ìàðêåð" ID_BULLET + MENUITEM "&Àáçàö . . ." ID_PARAFORMAT END END @@ -167,7 +168,8 @@ GROUPBOX "Ïàíåëè", 0, 150, 10, 120, 85 CHECKBOX "&Èíñòðóìåíòîâ", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Ôîðìàòèðîâàíèÿ", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ëèíåéêà", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END @@ -176,7 +178,7 @@ STRING_RICHTEXT_FILES_RTF, "Ôàéëû RTF (*.rtf)" STRING_TEXT_FILES_TXT, "Òåêñòîâûå äîêóìåíòû (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Äîêóìåíòû Unicode (*.txt)" - STRING_ALL_FILES, "Âñå äîêóìíòû (*.*)" + STRING_ALL_FILES, "Âñå äîêóìåíòû (*.*)" END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc Mon Jan 28 18:08:37 2008 @@ -67,6 +67,7 @@ BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR + MENUITEM "&Ruler", ID_TOGGLE_RULER MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options . . .", ID_VIEWPROPERTIES @@ -171,7 +172,8 @@ GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c Mon Jan 28 18:08:37 2008 @@ -2,7 +2,7 @@ * Wordpad implementation * * Copyright 2004 by Krzysztof Foltman - * Copyright 2007 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> + * Copyright 2007-2008 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -600,7 +600,7 @@ SendMessageW(hwndReBar, RB_SETBANDINFO, index, (LPARAM)&rbbinfo); } - if(bandId == BANDID_TOOLBAR || bandId == BANDID_FORMATBAR) + if(bandId == BANDID_TOOLBAR || bandId == BANDID_FORMATBAR || bandId == BANDID_RULER) store_bar_state(bandId, show); } @@ -618,6 +618,7 @@ set_toolbar_state(BANDID_FONTLIST, is_bar_visible(BANDID_FORMATBAR)); set_toolbar_state(BANDID_SIZELIST, is_bar_visible(BANDID_FORMATBAR)); set_toolbar_state(BANDID_FORMATBAR, is_bar_visible(BANDID_FORMATBAR)); + set_toolbar_state(BANDID_RULER, is_bar_visible(BANDID_RULER)); set_statusbar_state(is_bar_visible(BANDID_STATUSBAR)); update_window(); @@ -912,7 +913,9 @@ CheckDlgButton(hWnd, IDC_PAGEFMT_TB, TRUE); if(barState[ps->lParam] & (1 << BANDID_FORMATBAR)) CheckDlgButton(hWnd, IDC_PAGEFMT_FB, TRUE); - if(barState[ps->lParam] & (BANDID_STATUSBAR)) + if(barState[ps->lParam] & (1 << BANDID_RULER)) + CheckDlgButton(hWnd, IDC_PAGEFMT_RU, TRUE); + if(barState[ps->lParam] & (1 << BANDID_STATUSBAR)) CheckDlgButton(hWnd, IDC_PAGEFMT_SB, TRUE); } break; @@ -928,6 +931,7 @@ case IDC_PAGEFMT_TB: case IDC_PAGEFMT_FB: + case IDC_PAGEFMT_RU: case IDC_PAGEFMT_SB: CheckDlgButton(hWnd, LOWORD(wParam), !IsDlgButtonChecked(hWnd, LOWORD(wParam))); @@ -960,6 +964,11 @@ else barState[id] &= ~(1 << BANDID_FORMATBAR); + if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_RU)) + barState[id] |= (1 << BANDID_RULER); + else + barState[id] &= ~(1 << BANDID_RULER); + if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_SB)) barState[id] |= (1 << BANDID_STATUSBAR); else @@ -1182,7 +1191,7 @@ static int current_units_to_twips(float number) { - int twips = (int)(number * 567); + int twips = (int)(number * TWIPS_PER_CM); return twips; } @@ -1195,7 +1204,7 @@ static void number_with_units(LPWSTR buffer, int number) { - float converted = (float)number / 567; + float converted = (float)number / TWIPS_PER_CM; char string[MAX_STRING_LEN]; sprintf(string, "%.2f ", converted); @@ -1547,7 +1556,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) { - HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd; + HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); HANDLE hDLL; TBADDBITMAP ab; @@ -1648,6 +1657,16 @@ rbb.hwndChild = hFormatBarWnd; rbb.wID = BANDID_FORMATBAR; + + SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + + hRulerWnd = CreateWindowExW(0, WC_STATICW, NULL, WS_VISIBLE | WS_CHILD, + 0, 0, 200, 10, hReBarWnd, (HMENU)IDC_RULER, hInstance, NULL); + + + rbb.hwndChild = hRulerWnd; + rbb.wID = BANDID_RULER; + rbb.fStyle |= RBBS_BREAK; SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); @@ -2133,6 +2152,11 @@ update_window(); break; + case ID_TOGGLE_RULER: + set_toolbar_state(BANDID_RULER, !is_bar_visible(BANDID_RULER)); + update_window(); + break; + case ID_DATETIME: { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); @@ -2216,6 +2240,8 @@ CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, MF_BYCOMMAND|IsWindowVisible(hwndStatus) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_TOGGLE_RULER, MF_BYCOMMAND|(is_bar_visible(BANDID_RULER)) ? MF_CHECKED : MF_UNCHECKED); + gt.flags = GTL_NUMCHARS; gt.codepage = 1200; textLength = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); @@ -2241,6 +2267,7 @@ HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); + HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER); int rebarHeight = 0; int rebarRows = 2; @@ -2273,6 +2300,8 @@ GetClientRect(hWnd, &rc); MoveWindow(hwndEditor, 0, rebarHeight, rc.right, rc.bottom-nStatusSize-rebarHeight, TRUE); } + + redraw_ruler(hRulerWnd); return DefWindowProcW(hWnd, WM_SIZE, wParam, lParam); } @@ -2364,6 +2393,9 @@ WNDCLASSW wc; MSG msg; RECT rc; + UINT_PTR hPrevRulerProc; + HWND hRulerWnd; + POINTL EditPoint; static const WCHAR wszAccelTable[] = {'M','A','I','N','A','C','C','E','L', 'T','A','B','L','E','\0'}; @@ -2395,6 +2427,11 @@ get_default_printer_opts(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]); + hRulerWnd = GetDlgItem(GetDlgItem(hMainWnd, IDC_REBAR), IDC_RULER); + SendMessageW(GetDlgItem(hMainWnd, IDC_EDITOR), EM_POSFROMCHAR, (WPARAM)&EditPoint, 0); + hPrevRulerProc = SetWindowLongPtrW(hRulerWnd, GWLP_WNDPROC, (UINT_PTR)ruler_proc); + SendMessageW(hRulerWnd, WM_USER, (WPARAM)&EditPoint, hPrevRulerProc); + HandleCommandLine(GetCommandLineW()); while(GetMessageW(&msg,0,0,0)) Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.h (original) +++ trunk/reactos/base/applications/wordpad/wordpad.h Mon Jan 28 18:08:37 2008 @@ -1,6 +1,6 @@ /* * Copyright 2004 by Krzysztof Foltman - * Copyright 2007 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> + * Copyright 2007-2008 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,8 @@ #define MAX_STRING_LEN 255 +#define TWIPS_PER_CM 567 + #define ID_FILE_EXIT 1000 #define ID_FILE_OPEN 1001 #define ID_FILE_SAVE 1002 @@ -75,6 +77,7 @@ #define ID_TOGGLE_TOOLBAR 1500 #define ID_TOGGLE_FORMATBAR 1501 #define ID_TOGGLE_STATUSBAR 1502 +#define ID_TOGGLE_RULER 1503 #define PREVIEW_BUTTONS 4 @@ -106,10 +109,11 @@ #define IDC_PAGEFMT_TB 100 #define IDC_PAGEFMT_FB 101 -#define IDC_PAGEFMT_SB 102 -#define IDC_PAGEFMT_WW 103 -#define IDC_PAGEFMT_WM 104 -#define IDC_PAGEFMT_ID 105 +#define IDC_PAGEFMT_RU 102 +#define IDC_PAGEFMT_SB 103 +#define IDC_PAGEFMT_WW 104 +#define IDC_PAGEFMT_WM 105 +#define IDC_PAGEFMT_ID 106 #define ID_DATETIME 1600 #define ID_PARAFORMAT 1601 @@ -133,6 +137,7 @@ #define IDC_TABSTOPS 2012 #define IDC_FONTLIST 2013 #define IDC_SIZELIST 2014 +#define IDC_RULER 2015 #define IDD_DATETIME 2100 #define IDD_NEWFILE 2101 @@ -199,6 +204,8 @@ void get_default_printer_opts(void); void registry_set_pagemargins(HKEY); void registry_read_pagemargins(HKEY); +LRESULT CALLBACK ruler_proc(HWND, UINT, WPARAM, LPARAM); +void redraw_ruler(HWND); int reg_formatindex(WPARAM); void registry_read_filelist(HWND);

1 0

[fireball] 32035: - Properly fill ACPI BIOS configuration entry (a couple of ACPI specification structures were added, which should be moved to another header in future). This makes Windows 2003 initialize HAL (ACPI version) properly and be able to connect to the debugger. - Make harddisk identifiers lowercase.
by fireball＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: fireball Date: Mon Jan 28 16:29:45 2008 New Revision: 32035 URL: http://svn.reactos.org/svn/reactos?rev=32035&view=rev Log: - Properly fill ACPI BIOS configuration entry (a couple of ACPI specification structures were added, which should be moved to another header in future). This makes Windows 2003 initialize HAL (ACPI version) properly and be able to connect to the debugger. - Make harddisk identifiers lowercase. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Mon Jan 28 16:29:45 2008 @@ -79,7 +79,7 @@ /* Timeout in ms for sending to keyboard controller. */ #define CONTROLLER_TIMEOUT 250 -static CHAR Hex[] = "0123456789ABCDEF"; +static CHAR Hex[] = "0123456789abcdef"; static unsigned int delay_count = 1; extern ULONG reactos_disk_count; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Mon Jan 28 16:29:45 2008 @@ -23,7 +23,7 @@ BOOLEAN AcpiPresent = FALSE; -static BOOLEAN +static PRSDP_DESCRIPTOR FindAcpiBios(VOID) { PUCHAR Ptr; @@ -36,7 +36,7 @@ { DbgPrint((DPRINT_HWDETECT, "ACPI supported\n")); - return TRUE; + return (PRSDP_DESCRIPTOR)Ptr; } Ptr = (PUCHAR)((ULONG)Ptr + 0x10); @@ -44,7 +44,7 @@ DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); - return FALSE; + return NULL; } @@ -52,9 +52,16 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - CM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PRSDP_DESCRIPTOR Rsdp; + PACPI_BIOS_DATA AcpiBiosData; + BIOS_MEMORY_MAP BiosMemoryMap[32]; + ULONG BiosMemoryMapEntryCount, TableSize; - if (FindAcpiBios()) + Rsdp = FindAcpiBios(); + + if (Rsdp) { AcpiPresent = TRUE; @@ -65,31 +72,57 @@ AdapterClass, MultiFunctionAdapter, &BiosKey); - + /* Set 'Component Information' */ FldrSetComponentInformation(BiosKey, 0x0, 0x0, 0xFFFFFFFF); - + + /* Get BIOS memory map */ + RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); + BiosMemoryMapEntryCount = MachGetMemoryMap(BiosMemoryMap, + sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); + + /* Calculate the table size */ + TableSize = BiosMemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP) + + sizeof(ACPI_BIOS_DATA) - sizeof(BIOS_MEMORY_MAP); + /* Set 'Configuration Data' value */ - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); - PartialResourceList.Version = 0; - PartialResourceList.Revision = 0; - PartialResourceList.Count = 0; + PartialResourceList = + MmHeapAlloc(sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize); + memset(PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize); + PartialResourceList->Version = 0; + PartialResourceList->Revision = 0; + PartialResourceList->Count = 1; + + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; + PartialDescriptor->Type = CmResourceTypeDeviceSpecific; + PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; + PartialDescriptor->u.DeviceSpecificData.DataSize = TableSize; + + /* Fill the table */ + AcpiBiosData = (PACPI_BIOS_DATA)&PartialResourceList->PartialDescriptors[1]; + AcpiBiosData->RSDTAddress.LowPart = Rsdp->rsdt_physical_address; + AcpiBiosData->Count = BiosMemoryMapEntryCount; + memcpy(AcpiBiosData->MemoryMap, BiosMemoryMap, + BiosMemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); + + DbgPrint((DPRINT_HWDETECT, "RSDT %p, data size %x\n", Rsdp->rsdt_physical_address, + TableSize)); + FldrSetConfigurationData(BiosKey, - &PartialResourceList, - sizeof(CM_PARTIAL_RESOURCE_LIST) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize + ); /* Increment bus number */ (*BusNumber)++; - + /* Set 'Identifier' value */ FldrSetIdentifier(BiosKey, "ACPI BIOS"); + MmFreeMemory(PartialResourceList); } - - /* FIXME: Add congiguration data */ } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h Mon Jan 28 16:29:45 2008 @@ -1,83 +1,107 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __WINLDR_H -#define __WINLDR_H - - -/////////////////////////////////////////////////////////////////////////////////////// -// -// ReactOS Loading Functions -// -/////////////////////////////////////////////////////////////////////////////////////// -VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion); - -/* Entry-point to kernel */ -typedef -VOID -NTAPI -(*KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); - - -// Some definitions -#define SECTOR_SIZE 512 - -// Descriptors -#define NUM_GDT 128 // Must be 128 -#define NUM_IDT 0x100 // only 16 are used though. Must be 0x100 - -// conversion.c -PVOID VaToPa(PVOID Va); -PVOID PaToVa(PVOID Pa); -VOID List_PaToVa(LIST_ENTRY *ListEntry); -VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); - -// peloader.c -BOOLEAN -WinLdrLoadImage(IN PCHAR FileName, - TYPE_OF_MEMORY MemoryType, - OUT PVOID *ImageBasePA); - - -BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PCCH BaseDllName, - IN PCCH FullDllName, - IN PVOID BasePA, - OUT PLDR_DATA_TABLE_ENTRY *NewEntry); - -BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, - IN PCCH DirectoryPath, - IN PLDR_DATA_TABLE_ENTRY ScanDTE); - -// wlmemory.c -BOOLEAN -WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - ULONG PcrBasePage, - ULONG TssBasePage, - PVOID GdtIdt); - -// wlregistry.c -BOOLEAN WinLdrLoadAndScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); - - -#endif // defined __WINLDR_H +/* + * FreeLoader + * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __WINLDR_H +#define __WINLDR_H + + +/////////////////////////////////////////////////////////////////////////////////////// +// +// ReactOS Loading Functions +// +/////////////////////////////////////////////////////////////////////////////////////// +VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion); + +/* Entry-point to kernel */ +typedef +VOID +NTAPI +(*KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); + + +// Some definitions +#define SECTOR_SIZE 512 + +// Descriptors +#define NUM_GDT 128 // Must be 128 +#define NUM_IDT 0x100 // only 16 are used though. Must be 0x100 + +// conversion.c +PVOID VaToPa(PVOID Va); +PVOID PaToVa(PVOID Pa); +VOID List_PaToVa(LIST_ENTRY *ListEntry); +VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); + +// peloader.c +BOOLEAN +WinLdrLoadImage(IN PCHAR FileName, + TYPE_OF_MEMORY MemoryType, + OUT PVOID *ImageBasePA); + + +BOOLEAN +WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH BaseDllName, + IN PCCH FullDllName, + IN PVOID BasePA, + OUT PLDR_DATA_TABLE_ENTRY *NewEntry); + +BOOLEAN +WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH DirectoryPath, + IN PLDR_DATA_TABLE_ENTRY ScanDTE); + +// wlmemory.c +BOOLEAN +WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + ULONG PcrBasePage, + ULONG TssBasePage, + PVOID GdtIdt); + +// wlregistry.c +BOOLEAN WinLdrLoadAndScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN LPCSTR DirectoryPath); + + +/* FIXME: Should be moved to NDK, and respective ACPI header files */ +typedef struct _ACPI_BIOS_DATA +{ + PHYSICAL_ADDRESS RSDTAddress; + ULONGLONG Count; + BIOS_MEMORY_MAP MemoryMap[1]; /* Count of BIOS memory map entries */ +} ACPI_BIOS_DATA, *PACPI_BIOS_DATA; + +#include <pshpack1.h> +typedef struct /* Root System Descriptor Pointer */ +{ + CHAR signature [8]; /* contains "RSD PTR " */ + UCHAR checksum; /* to make sum of struct == 0 */ + CHAR oem_id [6]; /* OEM identification */ + UCHAR revision; /* Must be 0 for 1.0, 2 for 2.0 */ + ULONG rsdt_physical_address; /* 32-bit physical address of RSDT */ + ULONG length; /* XSDT Length in bytes including hdr */ + ULONGLONG xsdt_physical_address; /* 64-bit physical address of XSDT */ + UCHAR extended_checksum; /* Checksum of entire table */ + CHAR reserved [3]; /* reserved field must be 0 */ +} RSDP_DESCRIPTOR, *PRSDP_DESCRIPTOR; +#include <poppack.h> + + +#endif // defined __WINLDR_H Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Mon Jan 28 16:29:45 2008 @@ -77,7 +77,6 @@ #ifdef DBG DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); - //VerifyHeap(); #endif // DBG // Now return the pointer @@ -174,7 +173,6 @@ #ifdef DBG DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, StartPageNumber)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); - //VerifyHeap(); #endif // DBG // Now return the pointer @@ -228,7 +226,6 @@ #ifdef DBG DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); - //VerifyHeap(); #endif // DBG // Now return the pointer

1 0

[dreimer] 32034: Remove all Manifests. They will be autogenerated in the future. This is one step to MSVC Support, too. And it fixes Bug 3010
by dreimer＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: dreimer Date: Mon Jan 28 15:24:05 2008 New Revision: 32034 URL: http://svn.reactos.org/svn/reactos?rev=32034&view=rev Log: Remove all Manifests. They will be autogenerated in the future. This is one step to MSVC Support, too. And it fixes Bug 3010 Removed: trunk/reactos/base/applications/charmap/manifest.xml trunk/reactos/base/applications/games/winemine/manifest.xml trunk/reactos/base/applications/mmc/manifest.xml 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/sndvol32/manifest.xml trunk/reactos/base/setup/vmwinst/manifest.xml trunk/reactos/base/shell/explorer-new/manifest.xml 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/sysdm/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/rasdlg/manifest.xml Modified: trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/mmc/mmc.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/dll/cpl/access/access.rc trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/joy/joy.rc trunk/reactos/dll/cpl/liccpa/liccpa.rc trunk/reactos/dll/cpl/main/main.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/ncpa/ncpa.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc trunk/reactos/dll/cpl/telephon/telephon.rc trunk/reactos/dll/cpl/timedate/timedate.rc trunk/reactos/dll/cpl/usrmgr/usrmgr.rc trunk/reactos/dll/win32/rasdlg/rasdlg.rc Removed: 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 (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="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Character Map</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/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_ICON ICON "res/charmap.ico" Removed: 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 (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.WineMine" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS WineMine</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/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -14,11 +14,6 @@ IDB_FACES BITMAP MOVEABLE "rc/faces.bmp" IDB_LEDS BITMAP MOVEABLE "rc/leds.bmp" IDB_MINES BITMAP MOVEABLE "rc/mines.bmp" - -// Common Controls 6.0 for GCC -#if defined(__GNUC__) - 1 24 "manifest.xml" -#endif /* include localised resources */ #include "lang/bg-BG.rc" Removed: 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 (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.System.Management.Console" - type="win32" - /> - <description>ReactOS System Management Console</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/mmc/mmc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.… ============================================================================== --- trunk/reactos/base/applications/mmc/mmc.rc (original) +++ trunk/reactos/base/applications/mmc/mmc.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -1 24 DISCARDABLE "manifest.xml" - IDI_MAINAPP ICON DISCARDABLE resources/mmc.ico #include "rsrc.rc" Removed: 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 (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="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Device 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/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_MAIN_ICON ICON "res/computer.ico" IDB_ROOT_IMAGE BITMAP "res/root.bmp" Removed: 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 (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="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS EventLog Viewer</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/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" // Shared icons IDI_EVENTVWR ICON "res/eventvwr.ico" Removed: 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 (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="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Service 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/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_SM_ICON ICON "res/system.ico" Removed: 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 (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="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS Service 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/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_MSTSC ICON "res/mstsc.ico" IDI_LOGON ICON "res/logon.ico" Removed: 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 (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.Sound.Volume.Control" - type="win32" - /> - <description>ReactOS Volume Control</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/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/rsrc.rc (original) +++ trunk/reactos/base/applications/sndvol32/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "resources.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico Removed: trunk/reactos/base/setup/vmwinst/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/manifes… ============================================================================== --- trunk/reactos/base/setup/vmwinst/manifest.xml (original) +++ trunk/reactos/base/setup/vmwinst/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.VMware.SVGA.Installer" - type="win32" - /> - <description>ReactOS VMware(r) SVGA driver Installer</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/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/vmwinst/rsrc.rc (original) +++ trunk/reactos/base/setup/vmwinst/rsrc.rc Mon Jan 28 15:24:05 2008 @@ -2,8 +2,6 @@ #include "vmwinst.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" /* Bitmaps */ IDB_WATERMARK BITMAP "resources/watermark.bmp" Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc Mon Jan 28 15:24:05 2008 @@ -7,8 +7,6 @@ #include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -1 24 DISCARDABLE "manifest.xml" IDI_START ICON DISCARDABLE res/start.ico IDB_STARTMENU BITMAP DISCARDABLE res/logov.bmp Removed: 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 (removed) @@ -1,22 +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.Explorer" - type="win32" -/> -<description>ROS Explorer</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/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rc (original) +++ trunk/reactos/dll/cpl/access/access.rc Mon Jan 28 15:24:05 2008 @@ -9,8 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "access.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_CPLACCESS ICON "resources/applet.ico" #include "rsrc.rc" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rc (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rc Mon Jan 28 15:24:05 2008 @@ -13,8 +13,6 @@ #include <reactos/version.rc> #endif -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_APPICO ICON "resources/1501.ico" IDI_INSTICO ICON "resources/1502.ico" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "desk.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_DESK_ICON ICON "resources/applet.ico" IDC_DESK_ICON2 ICON "resources/applet.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_CPLICON ICON "resources/applet.ico" #include "rsrc.rc" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc (original) +++ trunk/reactos/dll/cpl/input/input.rc Mon Jan 28 15:24:05 2008 @@ -13,8 +13,6 @@ #include <reactos/version.rc> #endif -123 24 DISCARDABLE "manifest.xml" - IDI_KEYBOARD_ICO ICON "resources/keyboard.ico" IDI_MARKER_ICO ICON "resources/marker.ico" IDI_MIC_ICO ICON "resources/microphone.ico" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rc (original) +++ trunk/reactos/dll/cpl/intl/intl.rc Mon Jan 28 15:24:05 2008 @@ -9,8 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "intl.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_CPLICON ICON "resources/applet.ico" #include "rsrc.rc" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/joy/joy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.rc?rev=320… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.rc (original) +++ trunk/reactos/dll/cpl/joy/joy.rc Mon Jan 28 15:24:05 2008 @@ -13,8 +13,6 @@ #include <reactos/version.rc> #endif -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" #include "rsrc.rc" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.rc (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.rc Mon Jan 28 15:24:05 2008 @@ -11,8 +11,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "cplsample.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_CPLICON_1 ICON "resources/cpl_icon1.ico" #include "rsrc.rc" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rc (original) +++ trunk/reactos/dll/cpl/main/main.rc Mon Jan 28 15:24:05 2008 @@ -11,8 +11,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "main.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_CPLICON_1 ICON "resources/mouse.ico" IDC_CPLICON_2 ICON "resources/keyboard.ico" IDI_FOLDER_OPEN ICON "resources/folder_open.ico" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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/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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc Mon Jan 28 15:24:05 2008 @@ -9,8 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "mmsys.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_CPLICON ICON "resources/mmsys.ico" IDI_MUTED_ICON ICON "resources/muted.ico" IDI_MICROPHONE_ICON ICON "resources/microphone.ico" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rc (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #define REACTOS_STR_INTERNAL_NAME "ncpa\0" #define REACTOS_STR_ORIGINAL_FILENAME "ncpa.cpl\0" -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_HORIZONTAL ICON "resources/HORIZ.ICO" IDI_VERTICAL ICON "resources/VERTIC.ICO" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Mon Jan 28 15:24:05 2008 @@ -11,8 +11,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "powercfg.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_AC ICON "resources/ac.ico" IDI_ACDC ICON "resources/acdc.ico" IDI_DC ICON "resources/dc.ico" Removed: trunk/reactos/dll/cpl/sysdm/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/manifest.xml (original) +++ trunk/reactos/dll/cpl/sysdm/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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "sysdm.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_USERPROF ICON "resources/devmgr.ico" IDI_HARDPROF ICON "resources/devmgr.ico" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/telephon/telephon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.rc (original) +++ trunk/reactos/dll/cpl/telephon/telephon.rc Mon Jan 28 15:24:05 2008 @@ -13,8 +13,6 @@ #include <reactos/version.rc> #endif -123 24 DISCARDABLE "manifest.xml" - IDI_CPLSYSTEM ICON "resources/applet.ico" #include "rsrc.rc" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rc (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rc Mon Jan 28 15:24:05 2008 @@ -10,8 +10,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "timedate.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDC_CPLICON ICON "resources/applet.ico" IDC_WORLD BITMAP "resources/world.bmp" Removed: 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 (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.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System 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> - - Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rc (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Mon Jan 28 15:24:05 2008 @@ -9,8 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "usrmgr.cpl\0" #include <reactos/version.rc> -123 24 DISCARDABLE "manifest.xml" - IDI_USRMGR_ICON ICON "resources/applet.ico" IDI_USRMGR_ICON2 ICON "resources/applet.ico" Removed: 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 (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.System.Net.rasdlg" - type="win32" - /> - <description>ReactOS Ras dialog</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/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/rasdlg.rc (original) +++ trunk/reactos/dll/win32/rasdlg/rasdlg.rc Mon Jan 28 15:24:05 2008 @@ -6,8 +6,6 @@ #define REACTOS_STR_INTERNAL_NAME "rasdlg\0" #define REACTOS_STR_ORIGINAL_FILENAME "rasdlg.dll\0" #include <reactos/version.rc> - -128 24 DISCARDABLE "manifest.xml" 50 ICON "res/icons/50.ico" 51 ICON "res/icons/51.ico"

1 0

[dreimer] 32033: Remove all Manifests. They will be autogenerated in the future. This is one step to MSVC Support, too. And it fixes Bug 3010
by dreimer＠svn.reactos.org 28 Jan '08

28 Jan '08

Author: dreimer Date: Mon Jan 28 15:24:03 2008 New Revision: 32033 URL: http://svn.reactos.org/svn/reactos?rev=32033&view=rev Log: Remove all Manifests. They will be autogenerated in the future. This is one step to MSVC Support, too. And it fixes Bug 3010 Removed: trunk/rosapps/downloader/manifest.xml trunk/rosapps/imagesoft/manifest.xml trunk/rosapps/old_wordpad/manifest.xml trunk/rosapps/roscalc/manifest.xml Modified: trunk/rosapps/downloader/downloader.rc trunk/rosapps/imagesoft/imagesoft.rc trunk/rosapps/old_wordpad/wordpad.rc trunk/rosapps/roscalc/resource.rc Modified: trunk/rosapps/downloader/downloader.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.rc?r… ============================================================================== --- trunk/rosapps/downloader/downloader.rc (original) +++ trunk/rosapps/downloader/downloader.rc Mon Jan 28 15:24:03 2008 @@ -7,6 +7,4 @@ #include <reactos/version.rc> -1 24 DISCARDABLE "manifest.xml" - #include "rsrc.rc" Removed: trunk/rosapps/downloader/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/manifest.xml?re… ============================================================================== --- trunk/rosapps/downloader/manifest.xml (original) +++ trunk/rosapps/downloader/manifest.xml (removed) @@ -1,22 +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.Downloader" - type="win32" - /> - <description>ReactOS Downloader</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/imagesoft/imagesoft.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/imagesoft.rc?rev… ============================================================================== --- trunk/rosapps/imagesoft/imagesoft.rc (original) +++ trunk/rosapps/imagesoft/imagesoft.rc Mon Jan 28 15:24:03 2008 @@ -8,8 +8,6 @@ //#include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -1 24 DISCARDABLE "manifest.xml" IDI_IMAGESOFTICON ICON "res/imagesoft.ico" Removed: 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 (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.VMware.SVGA.Installer" - type="win32" - /> - <description>ReactOS VMware(r) SVGA driver Installer</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/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 (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.VMware.SVGA.Installer" - type="win32" - /> - <description>ReactOS VMware(r) SVGA driver Installer</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/wordpad.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/old_wordpad/wordpad.rc?rev… ============================================================================== --- trunk/rosapps/old_wordpad/wordpad.rc (original) +++ trunk/rosapps/old_wordpad/wordpad.rc Mon Jan 28 15:24:03 2008 @@ -6,8 +6,6 @@ #define REACTOS_STR_INTERNAL_NAME "wordpad\0" #define REACTOS_STR_ORIGINAL_FILENAME "wordpad.exe\0" //#include <reactos/version.rc> - -1 24 DISCARDABLE "manifest.xml" STRINGTABLE DISCARDABLE BEGIN Removed: 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 (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="Win32 Application.default.App" - 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/rosapps/roscalc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/resource.rc?rev=32… ============================================================================== --- trunk/rosapps/roscalc/resource.rc (original) +++ trunk/rosapps/roscalc/resource.rc Mon Jan 28 15:24:03 2008 @@ -30,8 +30,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -1 24 DISCARDABLE "manifest.xml" - // Icons IDI_CALC_BIG ICON DISCARDABLE "res/calc.ico"

1 0

← Newer
1
2
3
4
5
6
7
...
54
Older →

Jump to page:

2025

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