Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 20857: Add calculator icon
by gedmurphy＠svn.reactos.org 14 Jan '06

14 Jan '06

Add calculator icon Added: trunk/reactos/subsys/system/calc/calculator.ico Modified: trunk/reactos/subsys/system/calc/resource.h Modified: trunk/reactos/subsys/system/calc/rsrc.rc Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Added: trunk/reactos/subsys/system/calc/calculator.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/calc/calculator.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/calc/resource.h --- trunk/reactos/subsys/system/calc/resource.h 2006-01-14 17:35:56 UTC (rev 20856) +++ trunk/reactos/subsys/system/calc/resource.h 2006-01-14 17:59:59 UTC (rev 20857) @@ -32,6 +32,8 @@ #define IDM_SEPARATOR3 1010 #define IDM_WHATS_THIS 1011 +#define IDI_CALCICON 1050 + /* strings */ #define IDS_APPNAME 1100 _____ Modified: trunk/reactos/subsys/system/calc/rsrc.rc --- trunk/reactos/subsys/system/calc/rsrc.rc 2006-01-14 17:35:56 UTC (rev 20856) +++ trunk/reactos/subsys/system/calc/rsrc.rc 2006-01-14 17:59:59 UTC (rev 20857) @@ -21,6 +21,8 @@ #include <windows.h> #include "resource.h" +IDI_CALCICON ICON "calculator.ico" + #include "En.rc" #include "Cz.rc" #include "De.rc" _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2006-01-14 17:35:56 UTC (rev 20856) +++ trunk/reactos/subsys/system/calc/winecalc.c 2006-01-14 17:59:59 UTC (rev 20857) @@ -172,7 +172,7 @@ wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hInst; - wc.hIcon = LoadIcon( hInst, appname ); + wc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CALCICON)); wc.hCursor = LoadCursor( NULL, IDI_APPLICATION ); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); wc.lpszMenuName = NULL;

1 0

[gedmurphy] 20856: - Remove licence dialog boxes and implement an about box crediting authors and stating the licence.
by gedmurphy＠svn.reactos.org 14 Jan '06

14 Jan '06

- Remove licence dialog boxes and implement an about box crediting authors and stating the licence. - Add a notepad icon - rearrange the file structure Deleted: trunk/reactos/subsys/system/notepad/Cs.rc Deleted: trunk/reactos/subsys/system/notepad/Da.rc Deleted: trunk/reactos/subsys/system/notepad/De.rc Deleted: trunk/reactos/subsys/system/notepad/En.rc Deleted: trunk/reactos/subsys/system/notepad/Es.rc Deleted: trunk/reactos/subsys/system/notepad/Fi.rc Deleted: trunk/reactos/subsys/system/notepad/Fr.rc Deleted: trunk/reactos/subsys/system/notepad/Gr.rc Deleted: trunk/reactos/subsys/system/notepad/Hu.rc Deleted: trunk/reactos/subsys/system/notepad/It.rc Deleted: trunk/reactos/subsys/system/notepad/Ja.rc Deleted: trunk/reactos/subsys/system/notepad/License_En.c Deleted: trunk/reactos/subsys/system/notepad/Nl.rc Deleted: trunk/reactos/subsys/system/notepad/Pl.rc Deleted: trunk/reactos/subsys/system/notepad/Pt.rc Deleted: trunk/reactos/subsys/system/notepad/Ru.rc Deleted: trunk/reactos/subsys/system/notepad/Si.rc Deleted: trunk/reactos/subsys/system/notepad/Sk.rc Deleted: trunk/reactos/subsys/system/notepad/Sv.rc Deleted: trunk/reactos/subsys/system/notepad/Th.rc Deleted: trunk/reactos/subsys/system/notepad/Uk.rc Deleted: trunk/reactos/subsys/system/notepad/Wa.rc Deleted: trunk/reactos/subsys/system/notepad/Zh.rc Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/dialog.h Deleted: trunk/reactos/subsys/system/notepad/license.h Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/main.h Modified: trunk/reactos/subsys/system/notepad/notepad.h Modified: trunk/reactos/subsys/system/notepad/notepad.xml Modified: trunk/reactos/subsys/system/notepad/notepad_res.h Added: trunk/reactos/subsys/system/notepad/res/ Added: trunk/reactos/subsys/system/notepad/res/Cs.rc Added: trunk/reactos/subsys/system/notepad/res/Da.rc Added: trunk/reactos/subsys/system/notepad/res/De.rc Added: trunk/reactos/subsys/system/notepad/res/En.rc Added: trunk/reactos/subsys/system/notepad/res/Es.rc Added: trunk/reactos/subsys/system/notepad/res/Fi.rc Added: trunk/reactos/subsys/system/notepad/res/Fr.rc Added: trunk/reactos/subsys/system/notepad/res/Gr.rc Added: trunk/reactos/subsys/system/notepad/res/Hu.rc Added: trunk/reactos/subsys/system/notepad/res/It.rc Added: trunk/reactos/subsys/system/notepad/res/Ja.rc Added: trunk/reactos/subsys/system/notepad/res/Nl.rc Added: trunk/reactos/subsys/system/notepad/res/Pl.rc Added: trunk/reactos/subsys/system/notepad/res/Pt.rc Added: trunk/reactos/subsys/system/notepad/res/Ru.rc Added: trunk/reactos/subsys/system/notepad/res/Si.rc Added: trunk/reactos/subsys/system/notepad/res/Sk.rc Added: trunk/reactos/subsys/system/notepad/res/Sv.rc Added: trunk/reactos/subsys/system/notepad/res/Th.rc Added: trunk/reactos/subsys/system/notepad/res/Uk.rc Added: trunk/reactos/subsys/system/notepad/res/Wa.rc Added: trunk/reactos/subsys/system/notepad/res/Zh.rc Added: trunk/reactos/subsys/system/notepad/res/notepad.ico Modified: trunk/reactos/subsys/system/notepad/rsrc.rc _____ Deleted: trunk/reactos/subsys/system/notepad/Cs.rc --- trunk/reactos/subsys/system/notepad/Cs.rc 2006-01-14 16:31:28 UTC (rev 20855) +++ trunk/reactos/subsys/system/notepad/Cs.rc 2006-01-14 17:35:56 UTC (rev 20856) @@ -1,128 +0,0 @@ -/* - * Notepad (Czech resources) - * - * Copyright 1997,98 Marcel Baur - * Proofread 1998 by David Lee Lambert - * Copyright 2002 Sylvain Petreolle - * Copyright 2004 David Kredba - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL - -MAIN_MENU MENU -BEGIN - POPUP "&Soubor" - BEGIN - MENUITEM "&Nov²...", CMD_NEW - MENUITEM "&Otev°Ýt\tCtrl+O", CMD_OPEN - MENUITEM "&Ulo¥it\tCtrl+S", CMD_SAVE - MENUITEM "Ulo¥it j&ako...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Tisk", CMD_PRINT - MENUITEM "Nas&tavenÝ strßnky...", CMD_PAGE_SETUP - MENUITEM "NastavenÝ tiskß&rny...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Konec", CMD_EXIT - END - POPUP "U&pravit" - BEGIN - MENUITEM "&Zpýt\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Vyjmou&t\tCtrl+X", CMD_CUT - MENUITEM "&KopÝrovat\tCtrl+C", CMD_COPY - MENUITEM "&Vlo¥it\tCtrl+V", CMD_PASTE - MENUITEM "&Smazat\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH - MENUITEM "&Najdi dal?Ý\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Vybrat v?&e\tCtrl+A", CMD_SELECT_ALL - MENUITEM "?&as/Datum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "Zalo&mit dlouhÚ °ßdky", CMD_WRAP - MENUITEM "&PÝsmo...", CMD_FONT - END - POPUP "&Nßpovýda" - BEGIN - MENUITEM "&Obsah", CMD_HELP_CONTENTS - MENUITEM "&NajÝt...", CMD_HELP_SEARCH - MENUITEM "&Pomoc k nßpovýdý", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - END -END - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "NastavenÝ strßnky" -{ -LTEXT "Zß&hlavÝ:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&ZßpatÝ:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "&Okraje:", 0x144, 10, 43,160, 45 -LTEXT "&Lev²:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&HornÝ:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "P&rav²:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&DolnÝ:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Storno", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Nßpovýda", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Strana &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Notepad" -STRING_ERROR, "CHYBA" -STRING_WARNING, "VAROV?N?" -STRING_INFO, "Informace" - -STRING_UNTITLED, "(bez nßzvu)" - -STRING_ALL_FILES, "V?echny soubory (*.*)" -STRING_TEXT_FILES_TXT, "TextovÚ soubory (*.txt)" - -STRING_TOOLARGE, "Soubor '%s' je pro notepad p°Ýli? velk².\n \ -Pou¥ijte jin² editor, prosÝm." -STRING_NOTEXT, "Nebyl zadßn ¥ßdn² text. \ -\nPlease type something and try again" -STRING_DOESNOTEXIST, "Soubor '%s'\nneexistuje.\n\n \ -Chcete ho vytvo°it ?" -STRING_NOTSAVED, "Soubor '%s'\nbyl zmýnýn.\n\n \ -Chcete ulo¥it zmýny ?" -STRING_NOTFOUND, "'%s' nebyl nalezen." -STRING_OUT_OF_MEMORY, "NenÝ dost pamýti na dokonÞenÝ tÚto ·lohy. \ -\nUzav°ete jednu Þi vÝce aplikacÝ abyste zÝskali vÝce \nvolnÚ \ -pamýti." - -} _____ Deleted: trunk/reactos/subsys/system/notepad/Da.rc --- trunk/reactos/subsys/system/notepad/Da.rc 2006-01-14 16:31:28 UTC (rev 20855) +++ trunk/reactos/subsys/system/notepad/Da.rc 2006-01-14 17:35:56 UTC (rev 20856) @@ -1,126 +0,0 @@ -/* - * Notepad (Danish resources) - * - * Copyright 1998 Henrik Olsen <henrik(a)iaeste.dk> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL - -MAIN_MENU MENU -BEGIN - POPUP "&Fil" - BEGIN - MENUITEM "&Ny...", CMD_NEW - MENUITEM "?&bn\tEnter", CMD_OPEN - MENUITEM "&Gem", CMD_SAVE - MENUITEM "Gem so&m...", CMD_SAVE_AS - MENUITEM "Side&opsµtning...", CMD_PAGE_SETUP - MENUITEM "&Udskriv", CMD_PRINT - MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Afslut", CMD_EXIT - END - POPUP "&Rediger" - BEGIN - MENUITEM "&Fortryd\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Klip\tCtrl+X", CMD_CUT - MENUITEM "K&opier\tCtrl+C", CMD_COPY - MENUITEM "Sµt &ind\tCtrl+V", CMD_PASTE - MENUITEM "&Slet\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Marker &alt", CMD_SELECT_ALL - MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "Automatisk &linjeskift", CMD_WRAP - END - POPUP "&S°g" - BEGIN - MENUITEM "&S°g...", CMD_SEARCH - MENUITEM "&Find nµste\tF3", CMD_SEARCH_NEXT - END - POPUP "&Hjµlp" - BEGIN - MENUITEM "&Indhold", CMD_HELP_CONTENTS - MENUITEM "&S°g efter hjµlp om...", CMD_HELP_SEARCH - MENUITEM "&Brug af Hjµlp", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Om Notesblok", CMD_ABOUT_WINE - END -END - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Sideopsµtning" -{ -LTEXT "&Sidehoved:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "Side&fod:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "Margener:", 0x144, 10, 43,160, 45 -LTEXT "&Venstre:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&H°jre:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Bund:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Annuller", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hjµlp", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Side &s" -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Notesblok" -STRING_ERROR, "Fejl" -STRING_WARNING, "Advarsel" -STRING_INFO, "Information" - -STRING_UNTITLED, "(ikke-navngivet)" - -STRING_ALL_FILES, "Alle filer (*.*)" -STRING_TEXT_FILES_TXT, "Tekst filer (*.txt)" - -STRING_TOOLARGE, "Filen '%s' er for stor til Notesblok. \ -\nBrug en anden editor til at redigere filen." -STRING_NOTEXT, "Du har ikke skrevet noget tekst. \ -\nSkriv noget tekst, og pr°v sÕ igen" -STRING_DOESNOTEXIST, "Filen '%s'\neksistere ikke\n\n \ -Ïnkser du at oprette en ny fil?" -STRING_NOTSAVED, "Filen '%s'\ner blevet µndret\n\n \ -Ïnsker du at gemme µndringerne?" -STRING_NOTFOUND, "Kan ikke finde '%s'." -STRING_OUT_OF_MEMORY, "Der er ikke nok hukommelse til at udf°re \ -denne operation. \nAfslut et eller flere aktive programmer for at frig°re \ -hukommelse, og pr°v sÕ igen." - -} _____ Deleted: trunk/reactos/subsys/system/notepad/De.rc --- trunk/reactos/subsys/system/notepad/De.rc 2006-01-14 16:31:28 UTC (rev 20855) +++ trunk/reactos/subsys/system/notepad/De.rc 2006-01-14 17:35:56 UTC (rev 20856) @@ -1,137 +0,0 @@ -/* - * Notepad (German resources) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -MAIN_MENU MENU -BEGIN - POPUP "&Datei" - BEGIN - MENUITEM "&Neu...", CMD_NEW - MENUITEM "Í&ffnen...", CMD_OPEN - MENUITEM "&Speichern", CMD_SAVE - MENUITEM "Speichern &unter...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP - MENUITEM "&Drucken", CMD_PRINT - MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Beenden", CMD_EXIT - END - POPUP "&Bearbeiten" - BEGIN - MENUITEM "&R³ckgõngig\tStrg+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Ausschneiden\tStrg+X", CMD_CUT - MENUITEM "&Kopieren\tStrg+C", CMD_COPY - MENUITEM "&Einf³gen\tStrg+V", CMD_PASTE - MENUITEM "&L÷schen\tEntf", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Suchen...", CMD_SEARCH - MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT - MENUITEM "&Ersetzen\tCtrl+H", CMD_REPLACE - MENUITEM "Gehe zu...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Alles &markieren", CMD_SELECT_ALL - MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Zeilenumbruch", CMD_WRAP - MENUITEM "&Schriftart...", CMD_FONT - END - POPUP "&Anicht" - BEGIN - MENUITEM "Status&leiste", CMD_STATUSBAR - END - POPUP "&Hilfe" - BEGIN - MENUITEM "&Inhalt", CMD_HELP_CONTENTS - MENUITEM "&Suchen...", CMD_HELP_SEARCH - MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o", CMD_ABOUT_WINE - END -END - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Seite einrichten" -{ -LTEXT "&Kopfzeile:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Fu?zeile:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "Rõnder", 0x144, 10, 43,160, 45 -LTEXT "&Links:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Oben:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Rechts:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Unten:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Abbrechen", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hilfe", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Seite &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Editor" -STRING_ERROR, "Fehler" -STRING_WARNING, "Achtung" -STRING_INFO, "Information" - -STRING_UNTITLED, "(unbenannt)" - -STRING_ALL_FILES, "Alle Dateien (*.*)" -STRING_TEXT_FILES_TXT, "Textdateien (*.txt)" - -STRING_TOOLARGE, "Die Datei '%s' ist zu gro? f³r den Editor\n \ -Benutzen Sie bitte einen anderen Editor, um diese Datei zu bearbeiten." -STRING_NOTEXT, "Sie haben keinen Text eingegeben, der \ -gespeichert\n werden k÷nnte. Geben Sie Text ein, und versuchen Sie es \ -\nerneut." -STRING_DOESNOTEXIST, "Die Datei '%s'\nexistiert nicht.\n\n \ -M÷chten Sie eine neue Datei erstellen ?" -STRING_NOTSAVED, "Datei %s\n wurde geõndert.\n\n \ -M÷chten Sie die ?nderungen speichern ?" -STRING_NOTFOUND, "'%s' kann nicht gefunden werden." -STRING_OUT_OF_MEMORY, "Nicht gen³gend Arbeitsspeicher, \ -um diese Funktion \nabzuschlie?en. Beenden Sie eine oder mehrere \ -\nAnwendungen, um den verf³gbaren Arbeitsspeicher zu \nerh÷hen." - - -} _____ Deleted: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2006-01-14 16:31:28 UTC (rev 20855) +++ trunk/reactos/subsys/system/notepad/En.rc 2006-01-14 17:35:56 UTC (rev 20856) @@ -1,169 +0,0 @@ -/* - * Notepad (English resources) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -MAIN_MENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&New...", CMD_NEW - MENUITEM "&Open\tCtrl+O", CMD_OPEN - MENUITEM "&Save\tCtrl+S", CMD_SAVE - MENUITEM "Save &as...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Page Se&tup...", CMD_PAGE_SETUP - MENUITEM "&Print", CMD_PRINT - MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "E&xit", CMD_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", CMD_CUT - MENUITEM "&Copy\tCtrl+C", CMD_COPY - MENUITEM "&Paste\tCtrl+V", CMD_PASTE - MENUITEM "&Delete\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Find...\tCtrl+F", CMD_SEARCH - MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Time/Date\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Wrap long lines", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Help" - BEGIN - MENUITEM "&Contents", CMD_HELP_CONTENTS - MENUITEM "&Search...", CMD_HELP_SEARCH - MENUITEM "&Help on help", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&License", CMD_LICENSE - MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY - MENUITEM "Inf&o", CMD_ABOUT_WINE - END -END - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Page Setup" -{ -LTEXT "&Header:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Footer:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "&Margins:", 0x144, 10, 43,160, 45 -LTEXT "&Left:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Right:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Bottom:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -/* Dialog `Encoding' */ -DIALOG_ENCODING DIALOG 0, 0, 256, 44 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | - WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Encoding" -{ -COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP -LTEXT "Encoding:",0x155,5,2,41,12 -COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -LTEXT "Endlines:",0x156,5,20,41,12 -} - -/* Dialog 'Go To' */ -DIALOG_GOTO DIALOG 0,0,165,50 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Goto line" -{ -EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "Line number:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER -DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP -PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Notepad" -STRING_ERROR, "ERROR" -STRING_WARNING, "WARNING" -STRING_INFO, "Information" - -STRING_UNTITLED, "(untitled)" - -STRING_ALL_FILES, "All files (*.*)" -STRING_TEXT_FILES_TXT, "Text files (*.txt)" - -STRING_TOOLARGE, "File '%s' is too large for notepad.\n \ -Please use a different editor." -STRING_NOTEXT, "You didn't enter any text. \ -\nPlease type something and try again" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ -Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' can not be found." -STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ -task. \nClose one or more applications to increase the amount of \nfree \ -memory." -STRING_CANNOTFIND "Cannot find '%s'" -STRING_ANSI, "ANSI" -STRING_UNICODE, "Unicode" -STRING_UNICODE_BE, "Unicode (big endian)" -STRING_UTF8, "UTF-8" -STRING_CRLF, "Windows" -STRING_LF, "Unix" -STRING_CR, "Mac" -} _____ Deleted: trunk/reactos/subsys/system/notepad/Es.rc --- trunk/reactos/subsys/system/notepad/Es.rc 2006-01-14 16:31:28 UTC (rev 20855) +++ trunk/reactos/subsys/system/notepad/Es.rc 2006-01-14 17:35:56 UTC (rev 20856) @@ -1,137 +0,0 @@ -/* - * Notepad (Spanish resources) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> - * Proofread 1999 by Jose Marcos Lopez <jose.lopez(a)upcnet.upc.es> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2003,2004 JosÚ Manuel Ferrer Ortiz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -MAIN_MENU MENU -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Nuevo...", CMD_NEW - MENUITEM "&Abrir\tCtrl+O", CMD_OPEN - MENUITEM "&Guardar\tCtrl+S", CMD_SAVE - MENUITEM "Guardar &como...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Imprimir", CMD_PRINT - MENUITEM "Configurar &pßgina...", CMD_PAGE_SETUP - MENUITEM "Configuraci¾n &impresora...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Salir", CMD_EXIT - END - POPUP "&Editar" - BEGIN - MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cor&tar\tCtrl+X", CMD_CUT - MENUITEM "&Copiar\tCtrl+C", CMD_COPY - MENUITEM "&Pegar\tCtrl+V", CMD_PASTE - MENUITEM "&Borrar\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH - MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Hora y fecha\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Ajuste de lÝnea", CMD_WRAP - MENUITEM "Tipo de &letra...", CMD_FONT - END - POPUP "A&yuda" - BEGIN - MENUITEM "?&ndice", CMD_HELP_CONTENTS - MENUITEM "&Buscar...", CMD_HELP_SEARCH - MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Informaci¾n...", CMD_ABOUT_WINE - END -END - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Ajuste de pßgina" -{ -LTEXT "&Cabecera:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Pie:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "&Mßrgenes:", 0x144, 10, 43,160, 45 -LTEXT "&Izquierda:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "A&rriba:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Derecha:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "Aba&jo:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "Aceptar", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancelar", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Ayuda", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Pßgina &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Bloc de notas" -STRING_ERROR, "ERROR" -STRING_WARNING, "ADVERTENCIA" -STRING_INFO, "Informaci¾n" - -STRING_UNTITLED, "(sin tÝtulo)" - -STRING_ALL_FILES, "Todos los archivos (*.*)" -STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" - -STRING_TOOLARGE, "El archivo '%s' es demasiado grande para el \ - bloc de notas.\n Use otro editor." -STRING_NOTEXT, "No escribi¾ nada. \nPor favor escriba algo e \ - intÚntelo de nuevo" -STRING_DOESNOTEXIST, "El archivo '%s'\nno existe\n\n ?Desea crear \ - un nuevo archivo?" -STRING_NOTSAVED, "El texto en el archivo '%s' ha cambiado\n\n \ - ?Desea guardar los cambios?" -STRING_NOTFOUND, "No se encontr¾ '%s'." -STRING_OUT_OF_MEMORY, "No hay suficiente memoria para terminar esta \ - tarea. \nCierre una o mßs aplicaciones para \ - aumentar la cantidad \nde memoria libre." -STRING_CANNOTFIND "No pudo encontrar '%s'" -STRING_ANSI, "ANSI" -STRING_UNICODE, "Unicode" -STRING_UNICODE_BE, "Unicode (big endian)" -STRING_UTF8, "UTF-8" -STRING_CRLF, "Windows" -STRING_LF, "Unix" -STRING_CR, "Mac" - -} _____ Deleted: trunk/reactos/subsys/system/notepad/Fi.rc --- trunk/reactos/subsys/system/notepad/Fi.rc 2006-01-14 16:31:28 UTC (rev 20855) +++ trunk/reactos/subsys/system/notepad/Fi.rc 2006-01-14 17:35:56 UTC (rev 20856) @@ -1,124 +0,0 @@ -/* - * Notepad (Finnish resources) - * - * Copyright 1999 by Jukka Iivonen <iivonen(a)iki.fi> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL - -MAIN_MENU MENU -BEGIN - POPUP "&Tiedosto" - BEGIN - MENUITEM "&Uusi...", CMD_NEW - MENUITEM "&Avaa", CMD_OPEN - MENUITEM "Ta&lleta", CMD_SAVE - MENUITEM "Talleta &nimellõ...", CMD_SAVE_AS - MENUITEM "T&ulosta", CMD_PRINT - MENUITEM "&Sivun asetukset...", CMD_PAGE_SETUP - MENUITEM "&Kirjoittimen asetukset...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Poistu", CMD_EXIT - END - POPUP "&Muokkaa" - BEGIN - MENUITEM "&Palauta\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Leikkaa\tCtrl+X", CMD_CUT - MENUITEM "&Kopioi\tCtrl+C", CMD_COPY - MENUITEM "L&iitõ\tCtrl+V", CMD_PASTE - MENUITEM "P&oista\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Etsi...", CMD_SEARCH - MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "&Valitse kaikki", CMD_SELECT_ALL - MENUITEM "&Aika/Põivõmõõrõ\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "Ka&tkaise pitkõ rivi", CMD_WRAP - END - POPUP "&Apua" - BEGIN - MENUITEM "&Sisõlt÷", CMD_HELP_CONTENTS - MENUITEM "&Etsi...", CMD_HELP_SEARCH - MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - END -END - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Sivun asetukset" -{ -LTEXT "&Ylõotsikko:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "Alao&tsikko:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "&Marginaali:", 0x144, 10, 43,160, 45 -LTEXT "&Vasen:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "Y&lõ:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Oikea:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Ala:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Peruuta", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Apua", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Sivu &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Notepad" -STRING_ERROR, "VIRHE" -STRING_WARNING, "VAROITUS" -STRING_INFO, "Tiedoitus" - -STRING_UNTITLED, "(otsikoimaton)" - -STRING_ALL_FILES, "Kaikki tiedostot (*.*)" -STRING_TEXT_FILES_TXT, "Teksti tiedostot (*.txt)" - -STRING_TOOLARGE, "Tiedosto '%s' on liian suuri.\n \ -Please use a different editor." -STRING_NOTEXT, "Et sy÷ttõnyt lainkaan tekstiõ. \ -\nKirjoita jotain ja yritõ uudelleen" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ -Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' ei l÷ydy." -STRING_OUT_OF_MEMORY, "Muistia ei ole riittõvõsti tõmõn \ -\ntehtõvõn tekemiseksi. Sulje jokin sovellus vapauttaaksesi\n \ -muistia." - -} _____ Deleted: trunk/reactos/subsys/system/notepad/Fr.rc --- trunk/reactos/subsys/system/notepad/Fr.rc 2006-01-14 16:31:28 UTC (rev 20855) +++ trunk/reactos/subsys/system/notepad/Fr.rc 2006-01-14 17:35:56 UTC (rev 20856) @@ -1,127 +0,0 @@ -/* - * Notepad (French resources) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Translation by Laurent Buffler <laurent(a)bluewin.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -MAIN_MENU MENU -BEGIN - POPUP "&Fichier" - BEGIN - MENUITEM "&Nouveau...", CMD_NEW - MENUITEM "&Ouvrir\tCtrl+O", CMD_OPEN - MENUITEM "&Enregistrer\tCtrl+S", CMD_SAVE - MENUITEM "Enregistrer &sous...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Im&primer", CMD_PRINT - MENUITEM "&Mise en page...", CMD_PAGE_SETUP - MENUITEM "&Configuration de l'imprimante...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Quitter", CMD_EXIT - END - POPUP "&Edition" - BEGIN - MENUITEM "&Annuler\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Co&uper\tCtrl+X", CMD_CUT - MENUITEM "&Copier\tCtrl+C", CMD_COPY - MENUITEM "C&oller\tCtrl+V", CMD_PASTE - MENUITEM "&Effacer\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH - MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Tout &sÚlectionner\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Retour Ó la ligne", CMD_WRAP - MENUITEM "&Police...", CMD_FONT - END - POPUP "&Aide" - BEGIN - MENUITEM "&Sommaire", CMD_HELP_CONTENTS - MENUITEM "&Rechercher...", CMD_HELP_SEARCH - MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - END -END - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Mise en page" -{ -LTEXT "&En-tÛte :", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Pied de page :", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "&Marges :", 0x144, 10, 43,160, 45 -LTEXT "&Gauche :", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Haut :", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Droite :", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Bas :", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Annuler", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Aide", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Bloc-notes" -STRING_ERROR, "ERREUR" -STRING_WARNING, "ATTENTION" -STRING_INFO, "Information" - -STRING_UNTITLED, "(sans-titre)" - -STRING_ALL_FILES, "Tous fichiers (*.*)" -STRING_TEXT_FILES_TXT, "Fichiers texte (*.txt)" - -STRING_TOOLARGE, "Le fichier '%s' est trop grand pour le bloc-notes.\n \ -Veuillez utiliser un autre Úditeur." -STRING_NOTEXT, "Vous n'avez pas entrÚ de texte. \ -Veuillez taper quelque chose et recommencer" -STRING_DOESNOTEXIST, "Le fichier '%s'\nn'existe pas.\n\n \ -Voulez-vous crÚer un nouveau fichier ?" -STRING_NOTSAVED, "Le fichier '%s'\na ÚtÚ modifiÚ\n\n \ -Voulez-vous enregistrer vos modifications ?" -STRING_NOTFOUND, "'%s' non trouvÚ." -STRING_OUT_OF_MEMORY, "Pas assez de mÚmoire pour complÚter cette \ -tÔche. \nFermez une ou plusieurs applications pour libÚrer\n\ -de la mÚmoire." - -} _____ Deleted: trunk/reactos/subsys/system/notepad/Gr.rc --- trunk/reactos/subsys/system/notepad/Gr.rc 2006-01-14 16:31:28 UTC (rev 20855) +++ trunk/reactos/subsys/system/notepad/Gr.rc 2006-01-14 17:35:56 UTC (rev 20856) @@ -1,167 +0,0 @@ -/* - * Notepad (Greek resources) - * - * Copyright 2005 Apostolos Alexiadis (djapal(a)gmail.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of [truncated at 1000 lines; 5888 more skipped]

1 0

[weiden] 20855: fixed possible buffer overflows in LookupAccountSidW(): LSA_UNICODE_STRINGs are not necessarily NULL-terminated!
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

fixed possible buffer overflows in LookupAccountSidW(): LSA_UNICODE_STRINGs are not necessarily NULL-terminated! Modified: trunk/reactos/lib/advapi32/sec/misc.c _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2006-01-14 16:18:45 UTC (rev 20854) +++ trunk/reactos/lib/advapi32/sec/misc.c 2006-01-14 16:31:28 UTC (rev 20855) @@ -872,15 +872,14 @@ PSID_NAME_USE peUse ) { LSA_UNICODE_STRING SystemName; - LSA_OBJECT_ATTRIBUTES ObjectAttributes; - LSA_HANDLE PolicyHandle = INVALID_HANDLE_VALUE; + LSA_OBJECT_ATTRIBUTES ObjectAttributes = {0}; + LSA_HANDLE PolicyHandle = NULL; NTSTATUS Status; PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain = NULL; PLSA_TRANSLATED_NAME TranslatedName = NULL; BOOL ret; RtlInitUnicodeString ( &SystemName, pSystemName ); - ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); Status = LsaOpenPolicy ( &SystemName, &ObjectAttributes, POLICY_LOOKUP_NAMES, &PolicyHandle ); if ( !NT_SUCCESS(Status) ) { @@ -910,7 +909,8 @@ else { *pdwAccountName = dwSrcLen; - wcscpy ( pAccountName, TranslatedName->Name.Buffer ); + RtlCopyMemory ( pAccountName, TranslatedName->Name.Buffer, TranslatedName->Name.Length ); + pAccountName[TranslatedName->Name.Length / sizeof(WCHAR)] = L'\0'; } if ( peUse ) *peUse = TranslatedName->Use; @@ -929,7 +929,8 @@ else { *pdwDomainName = dwSrcLen; - wcscpy ( pDomainName, ReferencedDomain->Domains[0].Name.Buffer ); + RtlCopyMemory ( pDomainName, ReferencedDomain->Domains[0].Name.Buffer, ReferencedDomain->Domains[0].Name.Length ); + pDomainName[ReferencedDomain->Domains[0].Name.Length / sizeof(WCHAR)] = L'\0'; } } }

1 0

[weiden] 20854: improved error handling
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

improved error handling Modified: trunk/reactos/subsys/system/cacls/cacls.c Property changes on: trunk/reactos/subsys/system/cacls ___________________________________________________________________ Name: svn:ignore + *.o *.a *.d *.exe *.coff *.sym *.map GNUmakefile _____ Modified: trunk/reactos/subsys/system/cacls/cacls.c --- trunk/reactos/subsys/system/cacls/cacls.c 2006-01-14 16:08:57 UTC (rev 20853) +++ trunk/reactos/subsys/system/cacls/cacls.c 2006-01-14 16:18:45 UTC (rev 20854) @@ -19,7 +19,6 @@ #include <precomp.h> - static GENERIC_MAPPING FileGenericMapping = { FILE_GENERIC_READ, @@ -28,6 +27,7 @@ FILE_ALL_ACCESS }; + static INT LengthOfStrResource(IN HINSTANCE hInst, IN UINT uID) @@ -173,7 +173,7 @@ PSECURITY_DESCRIPTOR SecurityDescriptor; DWORD SDSize = 0; TCHAR FullFileName[MAX_PATH + 1]; - BOOL Ret = FALSE; + BOOL Error = FALSE, Ret = FALSE; Indent = _tcslen(FilePath) + _tcslen(FileName); if (Indent++ > MAX_PATH - 1) @@ -250,16 +250,13 @@ { if (GetLastError() == ERROR_NONE_MAPPED) { - if (!ConvertSidToStringSid(Sid, - &SidString)) - { - break; - } + goto BuildSidString; } else { if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { + Error = TRUE; break; } @@ -269,6 +266,7 @@ if (Name == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); + Error = TRUE; break; } @@ -285,10 +283,21 @@ HeapFree(GetProcessHeap(), 0, Name); - break; + Name = NULL; + goto BuildSidString; } } } + else + { +BuildSidString: + if (!ConvertSidToStringSid(Sid, + &SidString)) + { + Error = TRUE; + break; + } + } /* print the file name or space */ _tprintf(_T("%s "), @@ -389,7 +398,8 @@ DWORD Access; UINT uID; } - AccessRights[] = { + AccessRights[] = + { {FILE_WRITE_ATTRIBUTES, IDS_FILE_WRITE_ATTRIBUTES}, {FILE_READ_ATTRIBUTES, IDS_FILE_READ_ATTRIBUTES}, {FILE_DELETE_CHILD, IDS_FILE_DELETE_CHILD}, @@ -467,7 +477,8 @@ AceIndex++; } - Ret = TRUE; + if (!Error) + Ret = TRUE; } else { @@ -512,6 +523,7 @@ TCHAR *FilePart = NULL; WIN32_FIND_DATA FindData; HANDLE hFind; + DWORD LastError; BOOL ContinueAccessDenied = FALSE; if (argc > 2) @@ -553,11 +565,15 @@ if (!PrintFileDacl(FullPath, FindData.cFileName)) { - if (GetLastError() == ERROR_ACCESS_DENIED && - !ContinueAccessDenied) + LastError = GetLastError(); + + if (LastError == ERROR_ACCESS_DENIED && + ContinueAccessDenied) { + PrintErrorMessage(LastError); + } + else break; - } } else _tprintf(_T("\n"));

1 0

[cwittich] 20853: implemented PS_DOT, PS_DASH and PS_INSIDEFRAME in IntGdiCreatePenIndirect
by cwittich＠svn.reactos.org 14 Jan '06

14 Jan '06

implemented PS_DOT, PS_DASH and PS_INSIDEFRAME in IntGdiCreatePenIndirect (speeds up Thunderbird a bit (much less debug output) Modified: trunk/reactos/subsys/win32k/objects/pen.c _____ Modified: trunk/reactos/subsys/win32k/objects/pen.c --- trunk/reactos/subsys/win32k/objects/pen.c 2006-01-14 15:49:24 UTC (rev 20852) +++ trunk/reactos/subsys/win32k/objects/pen.c 2006-01-14 16:08:57 UTC (rev 20853) @@ -33,6 +33,8 @@ HPEN hPen; PGDIBRUSHOBJ PenObject; static const WORD wPatternAlternate[] = {0x5555}; + static const WORD wPatternDash[] = {0x0F0F}; + static const WORD wPatternDot[] = {0x3333}; if (LogPen->lopnStyle > PS_INSIDEFRAME) return 0; @@ -66,6 +68,21 @@ PenObject->hbmPattern = NtGdiCreateBitmap(8, 1, 1, 1, (LPBYTE)wPatternAlternate); break; + case PS_DOT: + PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; + PenObject->hbmPattern = NtGdiCreateBitmap(8, 1, 1, 1, (LPBYTE)wPatternDot); + break; + + case PS_DASH: + PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; + PenObject->hbmPattern = NtGdiCreateBitmap(8, 1, 1, 1, (LPBYTE)wPatternDash); + break; + + case PS_INSIDEFRAME: + /* FIXME: does it need some additional work? */ + PenObject->flAttrs |= GDIBRUSH_IS_SOLID; + break; + default: DPRINT1("FIXME: IntGdiCreatePenIndirect is UNIMPLEMENTED\n"); }

1 0

[mflyer] 20852: Logos for press, developers and fans. Sorry for the big Illustrator file, but we agreed it should be in SVN.
by mflyer＠svn.reactos.org 14 Jan '06

14 Jan '06

Logos for press, developers and fans. Sorry for the big Illustrator file, but we agreed it should be in SVN. Added: trunk/press-media/art/ Added: trunk/press-media/art/logo_alpha.png Added: trunk/press-media/art/logo_vector.ai Added: trunk/press-media/art/logo_vector.svgz Added: trunk/press-media/art/readme.txt _____ Added: trunk/press-media/art/logo_alpha.png (Binary files differ) Property changes on: trunk/press-media/art/logo_alpha.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/press-media/art/logo_vector.ai --- trunk/press-media/art/logo_vector.ai 2006-01-14 14:52:50 UTC (rev 20851) +++ trunk/press-media/art/logo_vector.ai 2006-01-14 15:49:24 UTC (rev 20852) @@ -0,0 +1,38774 @@ +%PDF-1.4%ÔÒ¤Ë +1 0 obj<< /Type /Catalog /Pages 2 0 R /Metadata 9770 0 R >> endobj2 0 obj<< /Type /Pages /Kids [ 5 0 R ] /Count 1 >> endobj3 0 obj<< /ModDate (D:20050813202145+02'00')/CreationDate (D:20050813191649+02'00')/Producer (Adobe PDF library 5.00)/Creator (Adobe Illustrator 10.0)>> endobj5 0 obj<< /Type /Page /MediaBox [ 0 0 612 792 ] /Parent 2 0 R /PieceInfo << /Illustrator 7766 1 R >> /LastModified (D:20050813202117+02'00')/ArtBox [ -966 -508 1578 1300 ] /Group 9765 0 R /TrimBox [ 0 0 612 792 ] /Thumb 9766 0 R /Contents 9768 0 R /Resources << /XObject << /Fm0 9681 0 R /Fm1 9703 0 R /Fm2 9720 0 R /Fm3 9737 0 R /Fm4 9754 0 R >> /ExtGState << /GS0 9696 0 R /GS1 9713 0 R /GS2 9730 0 R /GS3 9747 0 R /GS4 9764 0 R >> >> >> endobj7 1 obj<< /Length 1154 >> stream +%!PS-Adobe-3.0 +%%Creator: Adobe Illustrator(R) 10.0 +%%AI8_CreatorVersion: 10.0 +%%For: (Adobe) () +%%Title: (F:\\reactos\\irritator imports\\logotest.ai) +%%CreationDate: 8/13/2005 8:21 PM +%%BoundingBox: -945 -509 1608 1300 +%%HiResBoundingBox: -945 -509 1608 1300 +%%DocumentProcessColors: Cyan Magenta Yellow Black +%AI5_FileFormat 6.0 +%AI3_ColorUsage: Color +%AI7_ImageSettings: 0 +%%RGBProcessColor: 0 0 0 ([Registration]) +%%AI6_ColorSeparationSet: 1 1 (AI6 Default Color Separation Set) +%%+ Options: 1 16 0 1 0 1 0 0 0 0 1 1 1 18 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 2 3 4 +%%+ PPD: 1 21 0 0 60 45 2 2 1 0 0 1 0 0 0 0 0 0 0 0 0 0 () +%AI3_Cropmarks: -966 -508 1578 1300 +%AI3_TemplateBox: 306.5 395.5 306.5 395.5 +%AI3_TileBox: 30 33 582 761 +%AI3_DocumentPreview: None +%AI5_ArtSize: 612 792 +%AI5_RulerUnits: 2 +%AI9_ColorModel: 1 +%AI5_ArtFlags: 1 0 0 1 0 0 1 0 0 +%AI5_TargetResolution: 800 +%AI5_NumLayers: 5 +%AI9_OpenToView: -794 1352 0.6667 1578 1096 18 0 1 36 70 0 0 1 1 1 0 +%AI5_OpenViewLayers: 77777 +%%PageOrigin:30 33 +%AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 +%AI9_Flatten: 1 +%%EndComments +endstreamendobj8 1 obj<< /Length 8568 >> stream +%%BoundingBox: -945 -509 1608 1300 +%%HiResBoundingBox: -945 -509 1608 1300 +%AI7_Thumbnail: 128 92 8 +%%BeginData: 8020 Hex Bytes +%0000330000660000990000CC0033000033330033660033990033CC0033FF +%0066000066330066660066990066CC0066FF009900009933009966009999 +%0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 +%00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 +%3333663333993333CC3333FF3366003366333366663366993366CC3366FF +%3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 +%33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 +%6600666600996600CC6600FF6633006633336633666633996633CC6633FF +%6666006666336666666666996666CC6666FF669900669933669966669999 +%6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 +%66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF +%9933009933339933669933999933CC9933FF996600996633996666996699 +%9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 +%99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF +%CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 +%CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 +%CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF +%CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC +%FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 +%FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 +%FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 +%000011111111220000002200000022222222440000004400000044444444 +%550000005500000055555555770000007700000077777777880000008800 +%000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB +%DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF +%00FF0000FFFFFF0000FF00FFFFFF00FFFFFF +%524C45FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF +%27FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD +%2BFFA8A87DA87DA8A8FD1BFFA8A87DA87DA8A8FD2BFF27FD29FFA87DA8A8 +%FD05FFA87D7DA8A8FD12FFA87D7D7DA8A8FD04FFA87D7DA8FD28FF52FD28 +%FFA8A8FD0CFFA87DA8FD0EFF7DA8A8FD0CFFA8A8FD27FF52FD27FFA8A8FF +%FFFFA8FFA8FD09FFA8A87DFD09FFA87D7DFD0BFFA8FFA8FFFFA8A8FD26FF +%52FD26FFA87DFFA8FFA8FFA8A87DA87DFD09FF7DA8A8FD05FF7DA8FD08FF +%A8A87DA8A8FFA8FFA8FFA87DA8FD25FF52FD24FFA87D52FD0BFF7D7D7DFD +%07FFA87D7DFFA87DA8FD07FFA87D7DA8FD0AFFA87D7DFD24FF52FD24FFA8 +%A8A8FD0EFF7DA8A8FD10FFA87DA8FD0EFF7DA8A8FD23FF52FD23FFA8A8FF +%7DFD11FFA8A87D7D5353282E282E538484FFA8A8A8FD10FFA8FFA8FD23FF +%52FD23FF7DFFFFA8FD10FF5953282E062E282E282E282E2E53537EA8FD11 +%FF7DFFA8A8FD22FF27FD22FFA8A8FFFF7DFD0DFFA87D2E2E282E05280528 +%0528052E282E282E2E5959A8A8FD0EFFA8FFFF7DFD22FF52FD23FFA8FFFF +%A8FD0CFF84847E7E53592E2E052E0528052E282E282E2E2F2E595984A8FD +%0DFF7DFFFFA8FD22FF52FD22FFA8A8FFFF7DFD0AFFA87EA884A87E592E2E +%282805280528052E282E282E282E2853538484AFFD0BFFA8FFFF7DFD22FF +%52FD23FFA8FFFFA8FD09FF8484AFA8AF84A859592E2E28280528052E282F +%2E2E282F2E2F2E53537E84FD0BFF7DFFFFA8FD22FF52FD22FFA8A8FFFF7D +%FD07FFA87D538484A9A8A87E7E532E272805050528052E062E282E28532E +%2E2853538484AFA8FD07FF7DA8FFFF7DFD22FF52FD23FFA8FFFFFFA8FD06 +%FF7D537E84A984A9848459592E53282E052E282E282E2E2F2E59597E5359 +%2E535384A8AFAFFD06FFA8FFFFFFA8FD22FF52FD23FFA8FFFFFFA8FD05FF +%7D2E59537E7E84848459592F2E282E0528052E282E282E2E53537E7D5953 +%532E5353A8A8A9AFFD05FF7DFFFFFF7DFD22FF52FD23FF7DFFFFFF7DFD04 +%FFA82E532E59597E598459592E592E2E052E2828052E2E532E59597D5984 +%7D7D53592F5959A8A9AFFD04FFA8FD04FFA8FD22FF27FD23FF7DA8FFFFFF +%7DFFFFA8282F2E2F2E53535953592E2E282E052805280528052E2E59597E +%597E597E59592E532F5959A9A8A8FFFFFF7DFFFFFFA8A8FD22FF52FD23FF +%A8A8FFFFFFA8FFFF53592E2F2E532E532E532E2E282E282E052E282E052E +%282E2E597DA884A97E7E537D597E598484AFA8FFFFFFA8FFFFFF7DFD23FF +%52FD24FF7DFFFFFFA8A8A8532E2F282E282E282E282E282E052E05280528 +%0528052E282E2859598484A87D59537E597E598484A9A8FF7DFD04FF7DFD +%23FF52FD24FFA8A8FFFFFF7DAF7D592E2F2E2E282F2E2E282E2E2E282E28 +%2E282E282E282E282E2E597D8484A87D8484A984847DA8A9FFA8A8FFFFFF +%A8A8FD23FF52FD24FFA87DFFFFFF7D52A8532E282E282E282E282E282E28 +%2E282E282E272E282E052E285959847EA87E847EA884847D7E7EFFA97DA8 +%FFFFFF7DFD24FF52FD25FF7DFFFFFF5953A8842E532E532E595259525953 +%59525952532E532E532E2F2E5359A8A8AFA8FFA8A9A8AF84847EA9FFA87D +%FFFFFFA8A8FD24FF52FD26FF7DFFFF59537DA8592E532E532E5952595259 +%5359525952532E532E2E28532E7D7DA9A8AFA8A984A884A9848484FF5284 +%A8FFFF7DFD25FF52FD26FFA8FFFF595959A8847D52595359537D597D597D +%597D537D535952592E532E597D8484AFA8AF84AFA8A984A9A8FF7DA87EA8 +%FFA8A8FD25FF27FD26FFA87DA8A8597D52FFA859537D597D59FD047D7E7D +%7D597D535952592E532E5959847E8484A884AFA8A9A8FFA87D848484FF7D +%FD26FF52FD27FF7DA8A884597E7DFF7D7E7D847D847EA87DA87EA87DA87D +%7E597D597D537D597E7E8484A9A8FFA9FFA9FFFF7DA8AF84FF7DFD27FF52 +%FD28FF52FF847D597D84A87DA87EA87DA87EA87EA884A87DA87D7E7D7E59 +%7D597E597E5AA884AFA8FFA8FFFFA8A8A984A9A87DFD27FF52FD28FF7D7D +%FF7E7E7D7DA8A884FD0BA87EA87E847D847D847EFD0484AFAFFFA8FFFFA8 +%7DFFA9AFA87D7DFD27FF52FD26FFA8A953537DA97E7E7D7DA8AFFD05A8A9 +%FD06A87EA87D847D847E847EA9A8AFA8FFA8FFA8FF52FFA8FFA87D52A87D +%FD26FF52FD26FFA8A859597DFFAF84A884A8FFFFA8FFA8FFA9FFA8FFA8FF +%A8AFA8A8A8A9A8A8A8AFA9FFA9FD05FF7DFD04FFA9527EA8FF7DFD25FF52 +%FD25FFA8A8FF2E59597DA8A984AF7DA8A8FFA8FFA8FFA8FFA8FFA8AFA8AF +%A8A8A8AFA8AFA8FFA8FFA8FFFFFF7DA8A8FFA8FF527D53A8FFA8A8FD24FF +%52FD25FF7DFFA85959847DA8FFFFA8FF7DFFAFFFFFFFAFFFFFFFA8FFAFFF +%A8FFA8FFA8FFA9FFA8FD05FFA8A8A8FFFFFF7D84597DA8FFFF7DFD24FF27 +%FD24FF7DFFFFFF2E5959A852A8AFFFA8FF52A8A8FFA9FFA8FFA9FFA8FFA8 +%FFA8AFA8A9A8AFA8AFA8FFA8FF7DA8A8FFA8FF7D59535959A8FFFFA8A8FD +%23FF52FD23FFA8A8FFFFFF59597E84AF7DFD05FF7DFD0BFFA9FFA8FFA8FF +%A8AFA8FFAFFFA87DFFFFAFFFA87D597D5984A8FFFFFF7DFD23FF52FD23FF +%7DFD04FF5959598484A959FFA8FFFFFF7DFFFFFFAFFFFFFFA8FFA9FFA8FF +%A8A8A8A9A8A8A8FFA87DA8AFA8FFA87D7D59537D7DA8FD04FF7DFD22FF52 +%FD23FFA8FFFFFFA884597E7EA8A8AF7DFD05FF52FD0BFFA8FFA8A9A8A9A8 +%FFA87D84A884AFA87D7D7E59597D84A8FD04FFA8FD22FF52FD22FF7DFD04 +%FFA8A85959847EA9A8A87DFFA8FFFFA852FFFFFFA8FFFFFFA8FFA8FFA8AF +%A8A8A8FFA8597D7E7DA8A85253595259537D7DFF7DFFFFFFA8A8FD21FF52 +%FD21FFA8A8FFFFFFA8A8FF597E7EA8A8FFFFA8A8FD05FF7DFD09FFA9FFA8 +%AFA8FFA87D7D7E7EA9A87D597D537D597D7DFFFFA8A8FFFFFF7DFD21FF52 +%FD21FF7DA8FFFFFF7DFFAF7E59847EA9A8FFFFA87DFD05FF7DFD05FFA8FF +%A8FFA8AFA8FFA87D7D7D53A8A87D59595359527D597DA8FFFF7DFFFFFFA8 +%7DFD20FF52FD21FF7DFFFFFFA8FFFFFFA87E7DA8A8FFA9FFFFA8A8FD05FF +%7DFD05FFA9FFA8AFA8FF847D7D7E597EA87D7D7D53595359597E7EFFFFFF +%7DFD04FFA8FD20FF27FD20FF7DA8FFFFFF7DFFFFA8FF7D7E7DA8A8FFA8FF +%FFA87DFFFFFFA8FF7DA8A8FFA9FFA8FFA8FF7D7D7D7E7DA8A8522E595359 +%5259537D53FD05FF7DFFFFFF7DFD20FF52FD20FFA8FD04FFA8FD04FFA87D +%A8A8AFA9FD04FFA8A8FD05FF7DA8FD04FFA9FF7DA8848484AFA97D535953 +%59537D597D59A8FD05FFA8FD04FFA8FD1FFF52FD20FF7DFFFFFF7DFD05FF +%A87E7DA884AFA8FFFFFFA8A87DFD05FF7DA8FFFFA8FFA8A87EA87EAFA853 +%59592E595359527D5959A8FD05FFA8A8FFFFFF7DFD1FFF52FD20FFA8FFFF +%FFA8FD06FFA8847EA8A8FFA9FD04FFA87DFD05FFA87DFFFFA8AF84A87EA9 +%A87D597E5359597D597D597D84FD07FF7DFFFFFF7DFD1FFF52FD1FFFA8A8 +%FFFFA8A8FD05FFA8A87D7E7DA8A8AFA8FFA8FFA8A853FFA8FFA8FFA87DA8 +%FFA8A87E847D52597D53595359537D53597DFD08FF7DA8FFFF7DFD1FFF52 +%FD1FFFA8FFFFFF7DFD07FFA8AF7EA884A9A8FFAFFFAFFFFFFF7DFFFFFFA8 +%FFAF7D7DFFA9A984847E847D7E597D537D597D7DFD09FFA8A8FFFF7DFD1F +%FF52FD1FFFA8A8FFFFA8FD06FFA8FFA8A87D847EA884AFA8FFA8FFA8A87D +%A8A9FFA8A9A8A852FFA8A87D7E7D7D53595259527D59FD0BFF7DFFFFA8FD +%1FFF52FD1FFFA8FFFFFF7DFD09FFA8A87D8484A8A8AFA9FFA8FFA8AF7DA8 +%FFFFFD04A87DA8AFAF7D84597D5359537D59FD0CFFA8FFFF7DFD1FFF27FD +%1FFFA8A8FFFFA8FD08FFA8FFA8A87D847DA884FFA8FFA8A884A87D7DA8FF +%A8A87D7D53527DAFA8A87D5952597DFD0DFF7DFFFF7DFD1FFF52FD20FFA8 +%FFFF7DFD0BFFA8FFA8A8A8FFFFFFA87D7EA8A8A9847D7DFFA8A87D847D59 +%53AFA9FF7D7D7EFD0EFFA8FFFF7DFD1FFF52FD20FF7DFFFFA8FD0CFFA8FF +%A8FFA8A8597D84A87EA87E847D7D52A8A87E5959527D527DA8A8A8FD0FFF +%A8FFA8A8FD1FFF52FD21FF7DFFA8FD0FFFA87D7DA87EA884A8A9AF597D59 +%7D527DA8A8597D52597D7D7DFD12FF7DFD20FF52FD21FFA87DA8FD0CFFA8 +%A852A8A8FFA8FFA8FFA87D527D53592E5228527DFD04A8FFFFFF7D7D7DFD +%0DFF7D7DA8FD20FF52FD23FF52FD09FFA8A87DA8A8FD07FFA87D7DA87D84 +%7D7E597E7E847DFD09FF7DA8A8FD09FF7D7DA8FD21FF52FD24FF527D7DA8 +%7DA87DA87DA8A8FD08FFA87DA8FD0CFF7D7DA8FD08FFA87DA87DA87DA8FD +%047DFD23FF52FD24FFA8A8FD0FFF7D7DA8FD10FFA87DA8FD0FFF7DA8FD23 +%FF27FD25FFA87DFD0BFF7D7D7DFD15FFA87D7DA8A8FD09FFA87DA8FD24FF +%52FD27FF7DA87DFFA8FFA8A87DA8A8FD1BFFA8A87DA87DFFA8FFA8A87DA8 +%FD26FF52FD2AFFFD04A8FD24FFFD04A8FD29FF52FD7FFF52FD7FFF52FD7F +%FF52FD7FFF52FD7FFF27FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52 +%FD7FFF52FD7FFF52FD7FFF27FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7F +%FFFF +%%EndData +endstreamendobj9 1 obj<< /Filter [ /FlateDecode ] /Length 10 1 R >> stream +HëýW]o?}7Ó 0}ÉáuvåfCú(@råiÇ&1£ý?ª0ÈxÛ ++Kå$w?²§=¸Æ#ì,?ø}¤£HæþâC×s¯Õ¢/~w§±??«?1\?Îuu~÷ÔE\?Ýj}Y±ÚÛÝb±©?«ÚÈ? ÙWUS?«Ú. Â¢)w?0¼7¾i?rw-ÐË/¨±Wi?WtÛË|?p2]~?îº¥lWø¤fþÙ §|K#T¾¹çizïSïi¦j;lÂ»g¾W??`nÂ?ÒÝwì³NÈÁ«?KÐTW´Þû?z\Ì?ùwa§f?Û?)]]Þ?Uì®? ¬æ5¤Þ¤¾Ùa¾57v½/Å¸?r{Á^}6ø©Z¼Íø?*?2[V´fw©2½?6,½f½?ÿ}¨ ¤°À ·&?V}??Vå9oÕ?³²Oa

1 0

[weiden] 20851: fixed SeSetWorldSecurityDescriptor() so it creates a security descriptor that is at least valid
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

fixed SeSetWorldSecurityDescriptor() so it creates a security descriptor that is at least valid Modified: trunk/reactos/ntoskrnl/se/sd.c _____ Modified: trunk/reactos/ntoskrnl/se/sd.c --- trunk/reactos/ntoskrnl/se/sd.c 2006-01-14 13:37:08 UTC (rev 20850) +++ trunk/reactos/ntoskrnl/se/sd.c 2006-01-14 14:52:50 UTC (rev 20851) @@ -125,6 +125,7 @@ ULONG SidSize; ULONG SdSize; NTSTATUS Status; + PISECURITY_DESCRIPTOR_RELATIVE SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)SecurityDescriptor; DPRINT("SeSetWorldSecurityDescriptor() called\n"); @@ -133,8 +134,17 @@ return STATUS_ACCESS_DENIED; } + /* calculate the minimum size of the buffer */ SidSize = RtlLengthSid(SeWorldSid); - SdSize = sizeof(SECURITY_DESCRIPTOR) + (2 * SidSize); + SdSize = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + SdSize += SidSize; + if (SecurityInformation & GROUP_SECURITY_INFORMATION) + SdSize += SidSize; + if (SecurityInformation & DACL_SECURITY_INFORMATION) + { + SdSize += sizeof(ACL) + sizeof(ACE) + SidSize; + } if (*BufferLength < SdSize) { @@ -144,42 +154,57 @@ *BufferLength = SdSize; - Status = RtlCreateSecurityDescriptor(SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); + Status = RtlCreateSecurityDescriptorRelative(SdRel, + SECURITY_DESCRIPTOR_REVISION); if (!NT_SUCCESS(Status)) { return Status; } - SecurityDescriptor->Control |= SE_SELF_RELATIVE; - Current = (ULONG_PTR)SecurityDescriptor + sizeof(SECURITY_DESCRIPTOR); + Current = (ULONG_PTR)(SdRel + 1); if (SecurityInformation & OWNER_SECURITY_INFORMATION) { RtlCopyMemory((PVOID)Current, - SeWorldSid, - SidSize); - SecurityDescriptor->Owner = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); + SeWorldSid, + SidSize); + SdRel->Owner = (DWORD)((ULONG_PTR)Current - (ULONG_PTR)SdRel); Current += SidSize; } if (SecurityInformation & GROUP_SECURITY_INFORMATION) { RtlCopyMemory((PVOID)Current, - SeWorldSid, - SidSize); - SecurityDescriptor->Group = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); + SeWorldSid, + SidSize); + SdRel->Group = (DWORD)((ULONG_PTR)Current - (ULONG_PTR)SdRel); Current += SidSize; } if (SecurityInformation & DACL_SECURITY_INFORMATION) { - SecurityDescriptor->Control |= SE_DACL_PRESENT; + PACL Dacl = (PACL)Current; + SdRel->Control |= SE_DACL_PRESENT; + + Status = RtlCreateAcl(Dacl, + sizeof(ACL) + sizeof(ACE) + SidSize, + ACL_REVISION); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeWorldSid); + if (!NT_SUCCESS(Status)) + return Status; + + SdRel->Dacl = (DWORD)((ULONG_PTR)Current - (ULONG_PTR)SdRel); } if (SecurityInformation & SACL_SECURITY_INFORMATION) { - SecurityDescriptor->Control |= SE_SACL_PRESENT; + /* FIXME - SdRel->Control |= SE_SACL_PRESENT; */ } return STATUS_SUCCESS;

1 0

[weiden] 20850: implemented GetFinalPathNameByHandleA() and added stub for GetFinalPathNameByHandleW()
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

implemented GetFinalPathNameByHandleA() and added stub for GetFinalPathNameByHandleW() Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2006-01-14 12:42:04 UTC (rev 20849) +++ trunk/reactos/lib/kernel32/file/file.c 2006-01-14 13:37:08 UTC (rev 20850) @@ -1600,4 +1600,87 @@ return TRUE; } + +/* + * @implemented + */ +DWORD +WINAPI +GetFinalPathNameByHandleA(IN HANDLE hFile, + OUT LPSTR lpszFilePath, + IN DWORD cchFilePath, + IN DWORD dwFlags) +{ + WCHAR FilePathW[MAX_PATH]; + UNICODE_STRING FilePathU; + DWORD PrevLastError; + DWORD Ret = 0; + + if (cchFilePath != 0 && + cchFilePath > sizeof(FilePathW) / sizeof(FilePathW[0])) + { + FilePathU.Length = 0; + FilePathU.MaximumLength = cchFilePath * sizeof(WCHAR); + FilePathU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + FilePathU.MaximumLength); + if (FilePathU.Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + else + { + FilePathU.Length = 0; + FilePathU.MaximumLength = sizeof(FilePathW); + FilePathU.Buffer = FilePathW; + } + + /* save the last error code */ + PrevLastError = GetLastError(); + SetLastError(ERROR_SUCCESS); + + /* call the unicode version that does all the work */ + Ret = GetFinalPathNameByHandleW(hFile, + FilePathU.Buffer, + cchFilePath, + dwFlags); + + if (GetLastError() == ERROR_SUCCESS) + { + /* no error, restore the last error code and convert the string */ + SetLastError(PrevLastError); + + Ret = FilenameU2A_FitOrFail(lpszFilePath, + cchFilePath, + &FilePathU); + } + + /* free allocated memory if necessary */ + if (FilePathU.Buffer != FilePathW) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FilePathU.Buffer); + } + + return Ret; +} + + +/* + * @unimplemented + */ +DWORD +WINAPI +GetFinalPathNameByHandleW(IN HANDLE hFile, + OUT LPWSTR lpszFilePath, + IN DWORD cchFilePath, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return 0; +} + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2006-01-14 12:42:04 UTC (rev 20849) +++ trunk/reactos/lib/kernel32/kernel32.def 2006-01-14 13:37:08 UTC (rev 20850) @@ -387,6 +387,8 @@ GetFileSizeEx@8 GetFileTime@16 GetFileType@4 +GetFinalPathNameByHandleA@16 +GetFinalPathNameByHandleW@16 GetFirmwareEnvironmentVariableA@16 GetFirmwareEnvironmentVariableW@16 GetFullPathNameA@16 _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2006-01-14 12:42:04 UTC (rev 20849) +++ trunk/reactos/w32api/include/winbase.h 2006-01-14 13:37:08 UTC (rev 20850) @@ -1368,6 +1368,8 @@ DWORD WINAPI GetFileAttributesA(LPCSTR); #if (_WIN32_WINNT >= 0x0600) BOOL WINAPI GetFileAttributesByHandle(HANDLE,LPDWORD,DWORD); +DWORD WINAPI GetFinalPathNameByHandleA(HANDLE,LPSTR,DWORD,DWORD); +DWORD WINAPI GetFinalPathNameByHandleW(HANDLE,LPWSTR,DWORD,DWORD); #endif DWORD WINAPI GetFileAttributesW(LPCWSTR); BOOL WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS,PVOID); @@ -2042,8 +2044,11 @@ #define GetEnvironmentStrings GetEnvironmentStringsW #define GetEnvironmentVariable GetEnvironmentVariableW #define GetFileAttributes GetFileAttributesW +#define GetFileAttributesEx GetFileAttributesExW #define GetFileSecurity GetFileSecurityW -#define GetFileAttributesEx GetFileAttributesExW +#if (_WIN32_WINNT >= 0x0600) +#define GetFinalPathNameByHandle GetFinalPathNameByHandleW +#endif #define GetFullPathName GetFullPathNameW #define GetLogicalDriveStrings GetLogicalDriveStringsW #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) @@ -2241,8 +2246,11 @@ #define GetDriveType GetDriveTypeA #define GetEnvironmentVariable GetEnvironmentVariableA #define GetFileAttributes GetFileAttributesA +#define GetFileAttributesEx GetFileAttributesExA #define GetFileSecurity GetFileSecurityA -#define GetFileAttributesEx GetFileAttributesExA +#if (_WIN32_WINNT >= 0x0600) +#define GetFinalPathNameByHandle GetFinalPathNameByHandleA +#endif #define GetFullPathName GetFullPathNameA #define GetLogicalDriveStrings GetLogicalDriveStringsA #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)

1 0

[cwittich] 20849: fixed LoadCursorIconImage (Thunderbird is now working)
by cwittich＠svn.reactos.org 14 Jan '06

14 Jan '06

fixed LoadCursorIconImage (Thunderbird is now working) Modified: trunk/reactos/lib/user32/windows/bitmap.c _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2006-01-14 12:18:10 UTC (rev 20848) +++ trunk/reactos/lib/user32/windows/bitmap.c 2006-01-14 12:42:04 UTC (rev 20849) @@ -30,6 +30,29 @@ #include <user32.h> +#include "pshpack1.h" + +typedef struct { + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD xHotspot; + WORD yHotspot; + DWORD dwDIBSize; + DWORD dwDIBOffset; +} CURSORICONFILEDIRENTRY; + +typedef struct +{ + WORD idReserved; + WORD idType; + WORD idCount; + CURSORICONFILEDIRENTRY idEntries[1]; +} CURSORICONFILEDIR; + +#include "poppack.h" + /*forward declerations... actualy in user32\windows\icon.c but usful here****/ HICON ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot); HICON ICON_CreateIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot); @@ -71,6 +94,87 @@ } +/* + * The following macro functions account for the irregularities of + * accessing cursor and icon resources in files and resource entries. + */ +typedef BOOL (*fnGetCIEntry)( LPVOID dir, int n, + int *width, int *height, int *bits ); + +/********************************************************************** + * CURSORICON_FindBestCursor2 + * + * Find the cursor closest to the requested size. + * FIXME: parameter 'color' ignored and entries with more than 1 bpp + * ignored too + */ +static int CURSORICON_FindBestCursor2( LPVOID dir, fnGetCIEntry get_entry, + int width, int height, int color ) +{ + int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; + + /* Double height to account for AND and XOR masks */ + + height *= 2; + + /* First find the largest one smaller than or equal to the requested size*/ + + maxwidth = maxheight = 0; + for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + { + if ((cx <= width) && (cy <= height) && + (cx > maxwidth) && (cy > maxheight) && + (bits == 1)) + { + bestEntry = i; + maxwidth = cx; + maxheight = cy; + } + } + if (bestEntry != -1) return bestEntry; + + /* Now find the smallest one larger than the requested size */ + + maxwidth = maxheight = 255; + for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + { + if (((cx < maxwidth) && (cy < maxheight) && (bits == 1)) || + (bestEntry==-1)) + { + bestEntry = i; + maxwidth = cx; + maxheight = cy; + } + } + + return bestEntry; +} + +static BOOL CURSORICON_GetFileEntry( LPVOID dir, int n, + int *width, int *height, int *bits ) +{ + CURSORICONFILEDIR *filedir = dir; + CURSORICONFILEDIRENTRY *entry; + + if ( filedir->idCount <= n ) + return FALSE; + entry = &filedir->idEntries[n]; + *width = entry->bWidth; + *height = entry->bHeight; + *bits = entry->bColorCount; + return TRUE; +} + +static CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( CURSORICONFILEDIR *dir, + int width, int height, int color ) +{ + int n = CURSORICON_FindBestCursor2( dir, CURSORICON_GetFileEntry, + width, height, color ); + if ( n < 0 ) + return NULL; + return &dir->idEntries[n]; +} + static HANDLE LoadCursorIconImage( HINSTANCE hinst, @@ -85,19 +189,20 @@ HANDLE hfRes; HANDLE hFile; HANDLE hSection; - CURSORICONDIR *IconDIR; + CURSORICONFILEDIR *IconDIR; HDC hScreenDc; HICON hIcon; ULONG HeaderSize; ULONG ColorCount; ULONG ColorBits; PVOID Data; - CURSORICONDIRENTRY* dirEntry; + CURSORICONFILEDIRENTRY* dirEntry; ICONIMAGE* SafeIconImage = NULL; GRPCURSORICONDIR* IconResDir; INT id; ICONIMAGE *ResIcon; BOOL Icon = (uType == IMAGE_ICON); + DWORD filesize = 0; if (!(fuLoad & LR_LOADFROMFILE)) { @@ -158,14 +263,6 @@ return hIcon; } - /* - * FIXME: This code is incorrect and is likely to crash in many cases. - * In the file the cursor/icon directory records are stored like - * CURSORICONFILEDIR, but we treat them like CURSORICONDIR. In Wine - * this is solved by creating a fake cursor/icon directory in memory - * and passing that to CURSORICON_FindBestIcon. - */ - if (fuLoad & LR_SHARED) { DbgPrint("FIXME: need LR_SHARED support for loading icon images from files\n"); @@ -177,6 +274,7 @@ return NULL; hSection = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); + filesize = GetFileSize( hFile, NULL ); CloseHandle(hFile); if (hSection == NULL) return NULL; @@ -219,7 +317,7 @@ } /* Pick the best size. */ - dirEntry = (CURSORICONDIRENTRY *)CURSORICON_FindBestIcon(IconDIR, width, height, ColorBits); + dirEntry = CURSORICON_FindBestCursorFile( IconDIR, width, height, ColorBits ); if (!dirEntry) { DeleteDC(hScreenDc); @@ -227,7 +325,20 @@ return NULL; } - SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwBytesInRes); + if ( dirEntry->dwDIBOffset > filesize ) + { + DeleteDC(hScreenDc); + UnmapViewOfFile(IconDIR); + return NULL; + } + + if ( dirEntry->dwDIBOffset + dirEntry->dwDIBSize > filesize ){ + DeleteDC(hScreenDc); + UnmapViewOfFile(IconDIR); + return NULL; + } + + SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwDIBSize); if (SafeIconImage == NULL) { DeleteDC(hScreenDc); @@ -235,7 +346,7 @@ return NULL; } - memcpy(SafeIconImage, ((PBYTE)IconDIR) + dirEntry->dwImageOffset, dirEntry->dwBytesInRes); + memcpy(SafeIconImage, ((PBYTE)IconDIR) + dirEntry->dwDIBOffset, dirEntry->dwDIBSize); UnmapViewOfFile(IconDIR); /* At this point we have a copy of the icon image to play with. */

1 0

[weiden] 20848: add cacls.exe to the bootcd
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

add cacls.exe to the bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2006-01-14 09:04:42 UTC (rev 20847) +++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-14 12:18:10 UTC (rev 20848) @@ -183,6 +183,7 @@ subsys\smss\smss.exe 1 subsys\win32k\win32k.sys 1 subsys\system\autochk\autochk.exe 1 +subsys\system\cacls\cacls.exe 1 subsys\system\calc\calc.exe 1 subsys\system\cmd\cmd.exe 1 subsys\system\devmgr\devmgrapp.exe 1

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs