Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[navaraf] 14928: Potapnik <jirka@studioprojekt.cz>

by navaraf＠svn.reactos.com

Potapnik <jirka(a)studioprojekt.cz> Czech translation of Registry Editor. Added: trunk/reactos/subsys/system/regedit/Cz.rc Modified: trunk/reactos/subsys/system/regedit/rsrc.rc _____ Added: trunk/reactos/subsys/system/regedit/Cz.rc --- trunk/reactos/subsys/system/regedit/Cz.rc 2005-05-01 20:48:20 UTC (rev 14927) +++ trunk/reactos/subsys/system/regedit/Cz.rc 2005-05-01 20:53:29 UTC (rev 14928) @@ -0,0 +1,364 @@ +/* + * Regedit resources + * + * Copyright 2002 Robert Dickenson + * + * 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_DEFAULT + +/* + * Menu + */ + +IDC_REGEDIT MENU DISCARDABLE +BEGIN + POPUP "&Soubor" + BEGIN + MENUITEM "U&konÞit", ID_REGISTRY_EXIT + END + POPUP "&Nßpovýda" + BEGIN + MENUITEM "&O editoru registru ...", ID_HELP_ABOUT + END +END + +IDR_REGEDIT_MENU MENU DISCARDABLE +BEGIN + POPUP "&Registry" + BEGIN + MENUITEM "&Importovat soubor registru...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "&Exportovat do souboru registru...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "&P°ipojit sÝØov² registr...", + ID_REGISTRY_CONNECTNETWORKREGISTRY + , GRAYED + MENUITEM "&Odpojit sÝØov² registr...", + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + , GRAYED + MENUITEM SEPARATOR + MENUITEM "&Tisk\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "U&konÞit", ID_REGISTRY_EXIT + END + POPUP "&?pravy" + BEGIN + MENUITEM "&Zmýnit hodnotu", ID_EDIT_MODIFY + MENUITEM SEPARATOR + POPUP "&Nov²" + BEGIN + MENUITEM "&KlÝÞ", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Ïetýzec", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&BinßrnÝ hodnota", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Hodnota DWORD", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM SEPARATOR + MENUITEM "&OprßvnýnÝ...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "&Odstranit\tDel", ID_EDIT_DELETE + MENUITEM "&P°ejmenovat", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "Z&kopÝrovat nßzev klÝÞe", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "&Hledat\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "Hledat &dalÜÝ\tF3", ID_EDIT_FINDNEXT, GRAYED + END + POPUP "&Zobrazit" + BEGIN + MENUITEM "&Stavov² °ßdek", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Rozdýlit", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Aktualizovat\tF5", ID_VIEW_REFRESH + END + POPUP "&OblÝbenÚ" + BEGIN + MENUITEM "&P°idat k oblÝben²m", ID_FAVOURITES_ADDTOFAVOURITES + , GRAYED + MENUITEM "&Odebrat z oblÝben²ch", ID_FAVOURITES_REMOVEFAVOURITE + , GRAYED + END + POPUP "&Nßpovýda" + BEGIN + MENUITEM "&TÚmata nßpovýdy\tF1", ID_HELP_HELPTOPICS + MENUITEM SEPARATOR + MENUITEM "&O editoru registru", ID_HELP_ABOUT + END +END + +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Upravit", ID_EDIT_MODIFY + MENUITEM "Upravit &binßrnÝ data", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Odstranit\tDel", ID_EDIT_DELETE + MENUITEM "&P°ejmenovat", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&Nov²" + BEGIN + MENUITEM "&KlÝÞ", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Ïetýzec", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&BinßrnÝ hodnota", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Hodnota DWORD", ID_EDIT_NEW_DWORDVALUE + END + END +END + + +/* + * Dialog + */ + +IDD_EDIT_STRING DIALOG 32, 24, 252, 84 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?prava °etýzce" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nßzev:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,142,64,50,14 + PUSHBUTTON "Storno",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?prava vÝce-°etýzce" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nßzev:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Storno",IDCANCEL,196,154,50,14 +END + +IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?prava binßrnÝ hodnoty" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nßzev:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Data:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Storno",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?prava DWORD" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nßzev:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "Soustava",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "&èestnßctkovß",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "&DesÝtkovß",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "OK",IDOK,142,82,50,14 + PUSHBUTTON "Storno",IDCANCEL,196,82,50,14 +END + +/* + * String Table + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LIST_COLUMN_NAME "Nßzev" + IDS_LIST_COLUMN_TYPE "Typ" + IDS_LIST_COLUMN_DATA "Data" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Editor registru" + IDC_REGEDIT "REGEDIT" + IDC_REGEDIT_FRAME "REGEDIT_FRAME" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_MENU "Obsahuje p°Ýkazy pro prßci s cel²m registrem" + ID_EDIT_MENU "Obsahuje p°Ýkazy pro ·pravu hodnot a klÝÞ¨" + ID_VIEW_MENU "Obsahuje p°Ýkazy pro p°izp¨sobenÝ okna registru" + ID_FAVOURITES_MENU "Obsahuje p°Ýkazy pro p°Ýstup k Þasto pou×Ývan²m klÝÞ¨m" + ID_HELP_MENU "Obsahuje p°Ýkazy pro zobrazenÝ nßpovýdy a informacÝ o editoru registru" + ID_EDIT_NEW_MENU "Obsahuje p°Ýkazy pro vytvß°enÝ nov²ch klÝÞ¨ a hodnot" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_EDIT_MODIFY "Upravuje data polo×ky" + ID_EDIT_NEW_KEY "P°idß nov² klÝÞ" + ID_EDIT_NEW_STRINGVALUE "P°idß novou polo×ku ve formý °etýzce" + ID_EDIT_NEW_BINARYVALUE "P°idß novou polo×ku s binßrnÝ hodnotou" + ID_EDIT_NEW_DWORDVALUE "P°idß novou DWORD polo×ku" + ID_REGISTRY_IMPORTREGISTRYFILE "Importuje textov² soubor do registru" + ID_REGISTRY_EXPORTREGISTRYFILE + "Exportuje vÜechny Þßsti registru do textovÚho souboru" + ID_REGISTRY_CONNECTNETWORKREGISTRY + "P°ipojÝ se ke vzdßlenÚmu registru jinÚho poÞÝtaÞe" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + "OdpojÝ se od vzdßlenÚmu registru jinÚho poÞÝtaÞe" + ID_REGISTRY_PRINT "Vytiskne vÜechny Þßsti registru" +/* ID_HELP_HELPTOPICS "Otev°e tÚmata nßpovýdy pro editor registru" */ + ID_HELP_ABOUT "ZobrazÝ informace o aplikaci, verzi a copyright" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_EXIT "UkonÞÝ editor registru" + ID_FAVOURITES_ADDTOFAVOURITES "P°idß klÝÞ do seznamu oblÝben²ch" + ID_FAVOURITES_REMOVEFAVOURITE "Odebere klÝÞ ze seznamu oblÝben²ch" + ID_VIEW_STATUSBAR "ZobrazÝ nebo skryje stavov² °ßdek" + ID_VIEW_SPLIT "Upravuje polohu rozdýlovaÞe obou panel¨" + ID_VIEW_REFRESH "ObnovÝ okno" + ID_EDIT_DELETE "Sma×e v²býr" + ID_EDIT_RENAME "P°ejmenuje v²býr" + ID_EDIT_COPYKEYNAME "ZkopÝruje nßzev klÝÞe do schrßnky" + ID_EDIT_FIND "Hledß textov² °etýzec v klÝÞi, polo×kßch, nebo datech" + ID_EDIT_FINDNEXT "Hledß dalÜÝ v²skyt textu zadanÚho v p°edchozÝm hledßnÝ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "Chyba" + IDS_WARNING "UpozornýnÝ" + IDS_BAD_VALUE "Nelze se dotßzat polo×ky '%s'" + IDS_UNSUPPORTED_TYPE "Nelze upravovat klÝÞe tohoto typu (%ld)" + IDS_TOO_BIG_VALUE "Polo×ka je p°ÝliÜ velkß (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Polo×ky typu REG_MULTI_SZ nemohou obsahovat prßzdnÚ °etezce.\nPrßzdnÚ °etýzce byly odebrßny ze seznamu." + IDS_QUERY_DELETE_ONE "Opravdu chcete odstranit tuto polo×ku?" + IDS_QUERY_DELETE_MORE "Opravdu chcete odstranit tyto polo×ky?" + IDS_QUERY_DELETE_CONFIRM "PotvrzenÝ odstranýnÝ polo×ky" + IDS_ERR_DELVAL_CAPTION "Chyba p°i odstra?ovßnÝ polo×ek" + IDS_ERR_DELETEVALUE "Nelze odstranit vÜechny vybranÚ polo×ky!" + IDS_ERR_RENVAL_CAPTION "Chyba p°i p°ejmenovßnÝ polo×ky" + IDS_ERR_RENVAL_TOEMPTY "Nelze p°ejmenovat %s. Vybranß polo×ka je prßzdnß. VyzkouÜejte jin² nßzev." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(binßrnÝ polo×ka nulovÚ hodnoty)" + IDS_DEFAULT_VALUE_NAME "(V²chozÝ)" + IDS_VALUE_NOT_SET "(Hodnota nezadßna)" + IDS_UNKNOWN_TYPE "Neznßm² typ: (0x%lx)" + IDS_MY_COMPUTER "Tento poÞÝtaÞ" + IDS_IMPORT_REG_FILE "Importovat soubor registru" + IDS_EXPORT_REG_FILE "Exportovat do souboru registru" + IDS_INVALID_DWORD "(Neplatnß hodnota DWORD)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "Soubory registru" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "Soubory registru Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "VÜechny soubory (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "?plnÚ oprßvnýnÝ" + IDS_ACCESS_READ "?tenÝ" + IDS_ACCESS_QUERYVALUE "Dotaz na hodnotu" + IDS_ACCESS_SETVALUE "NastavenÝ hodnoty" + IDS_ACCESS_CREATESUBKEY "Vytvo°it podklÝÞ" + IDS_ACCESS_ENUMERATESUBKEYS "Zjistit poÞet podklÝÞ¨" + IDS_ACCESS_NOTIFY "Upozornit" + IDS_ACCESS_CREATELINK "Vytvo°it odkaz" + IDS_ACCESS_DELETE "Odstranit" + IDS_ACCESS_WRITEDAC "Zapsat DAC" + IDS_ACCESS_WRITEOWNER "Zapsat vlastnÝka" + IDS_ACCESS_READCONTROL "OprßvnýnÝ ke ÞtenÝ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "Pouze tento klÝÞ" + IDS_INHERIT_THISKEYANDSUBKEYS "Tento klÝÞ a jeho podklÝÞe" + IDS_INHERIT_SUBKEYSONLY "Pouze podklÝÞe" +END + +/*****************************************************************/ + + +/* + * Dialog + */ + +IDD_DIALOG1 DIALOG DISCARDABLE 50, 50, 268, 98 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,130,7,50,14 + PUSHBUTTON "Storno",IDCANCEL,130,24,50,14 +END + + +/* + * TEXTINCLUDE + */ + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + + + +/* + * String Table + */ + +/* + *STRINGTABLE DISCARDABLE + *BEGIN + * ID_HELP_HELPTOPICS "Otev°e nßpovýdu pro editor registru." + * ID_HELP_ABOUT "ZobrazÝ informace o aplikaci, verzi a copyright." + *END + */ + +/*****************************************************************/ _____ Modified: trunk/reactos/subsys/system/regedit/rsrc.rc --- trunk/reactos/subsys/system/regedit/rsrc.rc 2005-05-01 20:48:20 UTC (rev 14927) +++ trunk/reactos/subsys/system/regedit/rsrc.rc 2005-05-01 20:53:29 UTC (rev 14928) @@ -27,6 +27,7 @@ /* include localised resources */ +#include "Cz.rc" #include "De.rc" #include "En.rc" #include "Fr.rc"

19 years, 4 months

[navaraf] 14927: Potapnik <jirka@studioprojekt.cz>

by navaraf＠svn.reactos.com

Potapnik <jirka(a)studioprojekt.cz> Czech translation of VMWInst, Welcome and WinLogon (with one change by me). Added: trunk/reactos/subsys/system/vmwinst/Cz.rc Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc Added: trunk/reactos/subsys/system/welcome/Cz.rc Modified: trunk/reactos/subsys/system/welcome/welcome.rc Added: trunk/reactos/subsys/system/winlogon/Cz.rc Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc _____ Added: trunk/reactos/subsys/system/vmwinst/Cz.rc --- trunk/reactos/subsys/system/vmwinst/Cz.rc 2005-05-01 20:38:29 UTC (rev 14926) +++ trunk/reactos/subsys/system/vmwinst/Cz.rc 2005-05-01 20:48:20 UTC (rev 14927) @@ -0,0 +1,130 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaÞe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOS zjistil, ×e bý×Ý pod VMware(r).", -1, 100, 8, 160, 24 + LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaÞ klepnýte na 'DalÜÝ', pokud ovladaÞ instalovat nechcete, klepnýte na 'Storno'.", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaÞe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "StandardnÝ instalace ReactOS neobsahuje VMware(r) SVGA ovladaÞ.\n\nProto musÝte v okný VMware(r) workstation vybrat nabÝdku 'VM' a zvolit polo×ku 'Install VMware tools...'\n\n\nKlepnýte na 'DalÜÝ' pro pokraÞovßnÝ nebo 'Storno' pro p°eskoÞenÝ instalace SVGA ovladaÞe.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaÞe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaÞe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "OvladaÞ obrazovky VMware(r) SVGA byl ·spýÜný nainstalovßn. NynÝ, prosÝm, vyberte preferovanÚ rozliÜenÝ obrazovky:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "NynÝ vyberte preferovanou hloubku barev:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaÞe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nelze nainstalovat VMware(r) SVGA ovladaÞ.\n\n\nKlepnýte na 'DokonÞit' pro pokraÞovßnÝ v instalaÞnÝm procesu.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaÞe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "OvladaÞ VMware(r) SVGA je ji× nainstalovßn.\n\nNynÝ, prosÝm, zvolte, co chete provÚst:",-1,25,5,225,30 + PUSHBUTTON "Upravit nastavenÝ obrazovky", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Pou×Ýt jin² grafick² ovladaÞ", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Odebrat ovladaÞ VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "Klepnýte na 'DalÜÝ' pro pokraÞovßnÝ nebo na 'Storno' pro ukonÞenÝ pr¨vodce.", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaÞe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Vyberte, prosÝm, grafick² ovladaÞ, kter² chcete pou×Ýt:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA ovladaÞ", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE ovladaÞ (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "Klepnýte na 'DokonÞit' pro dokonÞenÝ operace nebo na 'Storno' pro ukonÞenÝ nastavenÝ beze zmýn.", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace ovladaÞe obrazovky" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "NynÝ bude odebrßn ovladaÞ VMware(r) SVGA!!!\n\n\nKlepnýte na 'DokonÞit' pro odebrßnÝ ovladaÞe nebo na 'Storno' pro ponechßnÝ.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Detekovßno prost°edÝ VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "ReactOS nem¨×e nalÚzt po×adovanÚ soubory.\nZkontrolujte, prosÝm, zda je VMware(r) tools CD-ROM sprßvný vlo×eno." + IDS_FAILEDTOCOPYFILES "Nelze zkopÝrovat po×adovanÚ soubory.\nZkontrolujte, prosÝm, zda je VMware(r) tools CD-ROM sprßvný vlo×eno.\n" + IDS_FAILEDTOACTIVATEDRIVER "Nepoda°ilo se zaktivovat VMware(r) SVGA ovladaÞ!" + IDS_FAILEDTOSELVGADRIVER "Nepoda°ilo se zaktivovat ReactOS VGA ovladaÞ!" + IDS_FAILEDTOSELVBEDRIVER "Nepoda°ilo se zaktivovat ReactOS VBE ovladaÞ!" + IDS_UNINSTNOTICE "Podp¨rnÚ soubory VMware(r) SVGA ovladaÞe nebyly odstranýny.\nSma×te je, prosÝm, po restarovßnÝ systÚmu." +END + +STRINGTABLE +BEGIN + 10001 "Nejni×ÜÝ (8BPP)" + 10002 "St°ednÝ (16BPP)" + 10003 "NejvyÜÜÝ (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "Hledß se VMware(r) Tools CD-ROM..." + IDS_COPYINGFILES "kopÝrujÝ se soubory..." + IDS_ENABLINGDRIVER "ZavßdÝ se ovladaÞ VMware(r) SVGA..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "Pr¨vodce instalacÝ VMware (r) SVGA ovladaÞe" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "Vlo×te, prosÝm, VMware(r) tools CD-ROM." + IDD_INSTALLING_VMWARE_TOOLSTITLE "Pr¨vodce instalacÝ VMware (r) SVGA ovladaÞe" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "VyhledßnÝ a kopÝrovßnÝ VMware (r) SVGA ovladaÞe." + IDD_CONFIGTITLE "Pr¨vodce instalacÝ VMware (r) SVGA ovladaÞe" + IDD_CONFIGSUBTITLE "Vyberte, prosÝm, preferovanÚ rozliÜenÝ obrazovky:" + IDD_INSTALLATION_FAILEDTITLE "Pr¨vodce instalacÝ VMware (r) SVGA ovladaÞe" + IDD_INSTALLATION_FAILEDSUBTITLE "Instalace ovladaÞe VMware (r) SVGA selhala." + IDD_CHOOSEACTIONTITLE "Pr¨vodce instalacÝ VMware (r) SVGA ovladaÞe" + IDD_CHOOSEACTIONSUBTITLE "Zvolte, prosÝm, co chete provÚst." + IDD_SELECTDRIVERTITLE "Pr¨vodce instalacÝ VMware (r) SVGA ovladaÞe" + IDD_SELECTDRIVERSUBTITLE "Vyberte ovladaÞ." + IDD_DOUNINSTALLTITLE "Pr¨vodce instalacÝ VMware (r) SVGA ovladaÞe" + IDD_DOUNINSTALLSUBTITLE "OdstranýnÝ ovladaÞe." +END _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc --- trunk/reactos/subsys/system/vmwinst/vmwinst.rc 2005-05-01 20:38:29 UTC (rev 14926) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.rc 2005-05-01 20:48:20 UTC (rev 14927) @@ -22,6 +22,7 @@ * files. Note that you can and may override resources which also have * a neutral version. This is to get localized bitmaps for example. */ +#include "Cz.rc" #include "En.rc" #include "De.rc" #include "Dk.rc" _____ Added: trunk/reactos/subsys/system/welcome/Cz.rc --- trunk/reactos/subsys/system/welcome/Cz.rc 2005-05-01 20:38:29 UTC (rev 14926) +++ trunk/reactos/subsys/system/welcome/Cz.rc 2005-05-01 20:48:20 UTC (rev 14927) @@ -0,0 +1,62 @@ +/* $Id: Cz.rc 12852 2005-04-30 23:58:04Z potapnik $ */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - VÝtejte" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "VÝtejte v operaÞnÝm systÚmu ReactOS.\n\nKlepnýte na tlaÞÝtko v levÚm sloupci." +// IDS_CHECKTEXT "Zobrazit dialog znovu" +// IDS_CLOSETEXT "Konec" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "Instalovat ReactOS" + IDS_TOPICBUTTON1 "ProhlÝ×et toto CD" + IDS_TOPICBUTTON2 "Konec" +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "Instalovat ReactOS" + IDS_TOPICTITLE1 "ProhlÝ×et toto CD" + IDS_TOPICTITLE2 "Konec" +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "Nainstaluje ReactOS na VßÜ poÞÝtaÞ nebo zaktualizuje existujÝcÝ systÚm." + IDS_TOPICDESC1 "ProhlÝ×et toto CD." + IDS_TOPICDESC2 "Klepnýte pro ukonÞenÝ tohoto programu." +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */ _____ Modified: trunk/reactos/subsys/system/welcome/welcome.rc --- trunk/reactos/subsys/system/welcome/welcome.rc 2005-05-01 20:38:29 UTC (rev 14926) +++ trunk/reactos/subsys/system/welcome/welcome.rc 2005-05-01 20:48:20 UTC (rev 14927) @@ -47,6 +47,7 @@ /* Language-specific resources */ +#include "Cz.rc" #include "En.rc" #include "De.rc" #include "Dk.rc" _____ Added: trunk/reactos/subsys/system/winlogon/Cz.rc --- trunk/reactos/subsys/system/winlogon/Cz.rc 2005-05-01 20:38:29 UTC (rev 14926) +++ trunk/reactos/subsys/system/winlogon/Cz.rc 2005-05-01 20:48:20 UTC (rev 14927) @@ -0,0 +1,45 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "VypnutÝ poÞÝtaÞe" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "NynÝ m¨×ete bez obav vypnout VßÜ poÞÝtaÞ.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&Restartovat", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Chyba u×ivatelskÚho rozhranÝ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Dynamickß knihovna %s selhala p°i nahrßvanÝ.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Kontaktujte sprßvce poÞÝtaÞe pro nahrazenÝ dynamický knihovny nebo obnovte p¨vodnÝ dynamickou knihovnu.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "P°Ýprava sÝØov²ch p°ipojenÝ..." + IDS_APPLYINGCOMPUTERSETTINGS "NastavenÝ poÞÝtaÞe..." + IDS_RUNNINGSTARTUPSCRIPTS "SpouÜtýcÝ skripty..." + IDS_RUNNINGSHUTDOWNSCRIPTS "UkonÞovacÝ skripty..." + IDS_APPLYINGYOURPERSONALSETTINGS "OsobnÝ nastavenÝ..." + IDS_RUNNINGLOGOFFSCRIPTS "Skripty po odhlßÜenÝ..." + IDS_RUNNINGLOGONSCRIPTS "Skripty po p°ihlßÜenÝ..." + IDS_LOADINGYOURPERSONALSETTINGS "NahrßvßnÝ osobnÝho nastavenÝ..." + IDS_CLOSINGNETWORKCONNECTIONS "UkonÞenÝ sÝØov²ch p°ipojenÝ..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS se vypÝnß..." + IDS_PREPARETOSTANDBY "P°Ýprava k p°echodu do ·spornÚho re×imu..." + IDS_PREPARETOHIBERNATE "P°Ýprava k p°echodu do re×imu hibernace..." + IDS_SAVEYOURSETTINGS "UklßdßnÝ osobnÝho nastavenÝ..." + IDS_REACTOSISSTARTINGUP "ReactOS se spouÜtÝ..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Aplikace Winlogon selhala p°i aktivaci shellu!" +END + _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc --- trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-05-01 20:38:29 UTC (rev 14926) +++ trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-05-01 20:48:20 UTC (rev 14927) @@ -12,6 +12,7 @@ /* IDI_WINLOGON ICON "resources/winlogon.ico" */ +#include "Cz.rc" #include "En.rc" #include "De.rc"

19 years, 4 months

[ion] 14926: i8042prt driver by tinus.

by ion＠svn.reactos.com

i8042prt driver by tinus. Modified: trunk/reactos/Makefile Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/txtsetup.sif Modified: trunk/reactos/drivers/input/Makefile Added: trunk/reactos/drivers/input/i8042prt/ Added: trunk/reactos/drivers/input/i8042prt/README.txt Added: trunk/reactos/drivers/input/i8042prt/i8042prt.c Added: trunk/reactos/drivers/input/i8042prt/i8042prt.h Added: trunk/reactos/drivers/input/i8042prt/i8042prt.rc Added: trunk/reactos/drivers/input/i8042prt/keyboard.c Added: trunk/reactos/drivers/input/i8042prt/makefile Added: trunk/reactos/drivers/input/i8042prt/mouse.c Added: trunk/reactos/drivers/input/i8042prt/ps2pp.c Added: trunk/reactos/drivers/input/i8042prt/registry.c Added: trunk/reactos/drivers/input/kbdclass/ Added: trunk/reactos/drivers/input/kbdclass/kbdclass.c Added: trunk/reactos/drivers/input/kbdclass/kbdclass.h Added: trunk/reactos/drivers/input/kbdclass/kbdclass.rc Added: trunk/reactos/drivers/input/kbdclass/makefile Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/include/ddk/ntdd8042.h Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/subsys/system/usetup/bootsup.c Modified: trunk/reactos/subsys/system/usetup/console.c Added: trunk/reactos/subsys/system/usetup/keytrans.c Added: trunk/reactos/subsys/system/usetup/keytrans.h Modified: trunk/reactos/subsys/system/usetup/makefile Modified: trunk/reactos/subsys/win32k/eng/device.c Modified: trunk/reactos/subsys/win32k/include/tags.h Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/tools/helper.mk Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-05-01 20:30:41 UTC (rev 14925) +++ trunk/reactos/Makefile 2005-05-01 20:38:29 UTC (rev 14926) @@ -84,7 +84,7 @@ DEVICE_DRIVERS = beep blue debugout null serial bootvid # Kernel mode input drivers -INPUT_DRIVERS = keyboard mouclass psaux sermouse +INPUT_DRIVERS = keyboard mouclass psaux sermouse i8042prt kbdclass # Kernel mode file system drivers # cdfs ext2 fs_rec ms np vfat _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-05-01 20:30:41 UTC (rev 14925) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-05-01 20:38:29 UTC (rev 14926) @@ -558,8 +558,14 @@ /* Load keyboard driver */ +#if 0 if (!LoadDriver(SourcePath, "keyboard.sys")) return; +#endif + if (!LoadDriver(SourcePath, "i8042prt.sys")) + return; + if (!LoadDriver(SourcePath, "kbdclass.sys")) + return; /* Load screen driver */ if (!LoadDriver(SourcePath, "blue.sys")) _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-05-01 20:30:41 UTC (rev 14925) +++ trunk/reactos/bootdata/hivesys.inf 2005-05-01 20:38:29 UTC (rev 14926) @@ -575,12 +575,29 @@ ;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Type",0x00010001,0x000000 01 ; Keyboard driver -HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","ErrorControl",0x0001 0001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Group",0x00000000,"K eyboard Port" -HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","ImagePath",0x0002000 0,"system32\drivers\keyboard.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Start",0x00010001,0x 00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Type",0x00010001,0x0 0000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","ErrorControl",0x000 10001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Group",0x00000000," Keyboard Port" +;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","ImagePath",0x000200 00,"system32\drivers\keyboard.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Start",0x00010001,0 x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Type",0x00010001,0x 00000001 +; i8042 port driver +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ErrorControl",0x0001 0001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Group",0x00000000,"K eyboard Port" +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ImagePath",0x0002000 0,"system32\drivers\i8042prt.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x 00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Type",0x00010001,0x0 0000001 + +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRat e",0x00010001,0x00000060 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","BreakOnSy sRq",0x00010001,0x00000001 + +; Keyboard class driver +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x0001 0001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"K eyboard Class" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x0002000 0,"system32\drivers\kbdclass.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x 00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x0 0000001 + ; Serial port enumerator HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ErrorControl",0x000100 01,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Group",0x00000000,"PNP Filter" @@ -840,12 +857,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00 000010 ; PS/2 mouse port driver -HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","ErrorControl",0x0001000 1,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Group",0x00000000,"Poin ter Port" -HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","ImagePath",0x00020000," system32\drivers\psaux.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Start",0x00010001,0x000 00004 -HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Type",0x00010001,0x0000 0001 -HKLM,"SYSTEM\CurrentControlSet\Services\Psaux\Parameters","DisableExten sionDetection",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","ErrorControl",0x000100 01,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Group",0x00000000,"Poi nter Port" +;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","ImagePath",0x00020000, "system32\drivers\psaux.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Start",0x00010001,0x00 000004 +;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Type",0x00010001,0x000 00001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux\Parameters","DisableExte nsionDetection",0x00010001,0x00000000 ; RPC service HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001 ,0x00000001 _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-05-01 20:30:41 UTC (rev 14925) +++ trunk/reactos/bootdata/txtsetup.sif 2005-05-01 20:38:29 UTC (rev 14926) @@ -22,7 +22,9 @@ class2.sys = 3 disk.sys = 3 floppy.sys = 3 -keyboard.sys = 3 +;keyboard.sys = 3 +i8042prt.sys = 3 +kbdclass.sys = 3 l_intl.nls = 2 ntfs.sys = 3 ntoskrnl.exe = 2 @@ -96,14 +98,16 @@ [Mouse] ;<id> = <user friendly name>,<spare>,<service key name> -msps2 = "Microsoft PS2 Mouse",,psaux +i8042ps2 = "PS2 Mouse",,i8042prt +;msps2 = "Microsoft PS2 Mouse",,psaux msser = "Microsoft Serial Mouse",,sermouse mswhs = "Microsoft Serial Wheel Mouse",,sermouse none = "No Mouse" [Map.Mouse] ;<id> = <pnp id string> -msps2 = "MICROSOFT PS2 MOUSE" +i8042ps2 = "MICROSOFT PS2 MOUSE" +;msps2 = "MICROSOFT PS2 MOUSE" msser = "MICROSOFT SERIAL MOUSE" mswhs = "MICROSOFT MOUSE WITH WHEEL" none = "NO MOUSE" _____ Modified: trunk/reactos/drivers/input/Makefile --- trunk/reactos/drivers/input/Makefile 2005-05-01 20:30:41 UTC (rev 14925) +++ trunk/reactos/drivers/input/Makefile 2005-05-01 20:38:29 UTC (rev 14926) @@ -6,7 +6,7 @@ include $(PATH_TO_TOP)/rules.mak -DRIVERS = keyboard mouclass psaux sermouse +DRIVERS = keyboard mouclass psaux sermouse i8042prt kbdclass all: $(DRIVERS) _____ Added: trunk/reactos/drivers/input/i8042prt/README.txt --- trunk/reactos/drivers/input/i8042prt/README.txt 2005-05-01 20:30:41 UTC (rev 14925) +++ trunk/reactos/drivers/input/i8042prt/README.txt 2005-05-01 20:38:29 UTC (rev 14926) @@ -0,0 +1,83 @@ +Intel 8042 port driver + +This directory contains a driver for Intels 8042 and compatible controllers. +It is based on the information in the DDK documentation on MSDN. It is intended +to be compatible with keyboard and mouse drivers written for Windows. It is +not based on the i8042prt example driver that's included with the DDK. + +The directory contains these files: + +i8042prt.c: Main controller functionality, things shared by keyboards and mice + +keyboard.c: keyboard functionality: detection, interrupt handling + +mouse.c: mouse functionality: detection, interrupt handling, packet parsing for + standard ps2 and microsoft mice + +ps2pp.c: logitech ps2++ mouse packat parsing (basic) + +registry.c: registry reading + +makefile, i8042prt.rc: obvious + + +Some parts of the driver make little sense. This is because it implements +an interface that has evolved over a long time, and because the ps/2 +'standard' is really awful. + +Things to add: + +- Better AT (before ps2) keyboard handling +- SiS keyboard controller detection +- Mouse identification +- General robustness: reset mouse if things go wrong +- Handling all registry settings +- ACPI +- Make it work more like a WDM driver + +Things not to add: + +- Other mouse protocols, touchpad handling etc. : Write a filter driver instead +- Keyboard lights handling: Should be in win32k +- Keyboard scancode translation: Should be in win32k + +Things requiring work elsewhere: + +- Debugger interface (TAB + key): + Currently this interface wants translated keycodes, which are not + implemented by this driver. As it just uses a giant switch with + hardcoded cases, this should not be hard to fix. + +- Class drivers: + I wrote a keyboard class driver, which does keycode translations. It + should not do this, win32k should get untranslated keycodes and do + the translation itself. + + I changed the mouse class driver (mouclass) to work like Microsofts mouclass. + Unfortunately this means that the original psaux driver doesn't work + anymore (the same holds for the other mice drivers, probably). + + The keyboard class driver passes on ioctls from win32k, so it can change + keyboard settings. As far as I could see, the mouse class driver does not + do this yet. + + The class drivers should be able to handle reads for more than one packet + at a time (kbdclass should, mouclass does not). Win32k should send such + requests. + + +I put a lot of work in making it work like Microsofts driver does, so third party drivers can work. Please keep it that way. + + +Links: + +Here's a link describing most of the registry settings: + +http://www.microsoft.com/resources/documentation/Windows/2000/server/re skit/en-us/Default.asp?url=/resources/documentation/Windows/2000/server/ reskit/en-us/regentry/31493.asp + +PS/2 protocol documentation: + +http://www.win.tue.nl/~aeb/linux/kbd/scancodes.html + +It also contains a link to a description of the ps2++ protocol, which has +since disappeared. Archive.org still has it. _____ Added: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-05-01 20:30:41 UTC (rev 14925) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-05-01 20:38:29 UTC (rev 14926) @@ -0,0 +1,804 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/input/i8042prt/i8042prt.c + * PURPOSE: i8042 (ps/2 keyboard-mouse controller) driver + * PROGRAMMER: Victor Kirhenshtein (sauros(a)iname.com) + * Jason Filby (jasonfilby(a)yahoo.com) + * Tinus + */ + +/* INCLUDES ****************************************************************/ + +#include <ddk/ntddk.h> +#include <string.h> +#include <ntos/keyboard.h> +#include <ntos/minmax.h> +#include <rosrtl/string.h> + +#include <ddk/ntddkbd.h> +#include <ddk/ntdd8042.h> + +#define NDEBUG +#include <debug.h> + +#include "i8042prt.h" + +/* GLOBALS *******************************************************************/ + +/* + * Driver data + */ +#define I8042_TIMEOUT 500000 + +#define I8042_MAX_COMMAND_LENGTH 16 +#define I8042_MAX_UPWARDS_STACK 5 + +/* FUNCTIONS *****************************************************************/ + +/* + * FUNCTION: Write data to a port, waiting first for it to become ready + */ +BOOLEAN I8042Write(PDEVICE_EXTENSION DevExt, int addr, BYTE data) +{ + ULONG ResendIterations = DevExt->Settings.PollingIterations; + + while ((KBD_IBF & READ_PORT_UCHAR((PUCHAR)I8042_CTRL_PORT)) && + (ResendIterations--)) + { + KeStallExecutionProcessor(50); + } + + if (ResendIterations) { + WRITE_PORT_UCHAR((PUCHAR)addr,data); + DPRINT("Sent %x to %x\n", data, addr); + return TRUE; + } + return FALSE; +} + +#if 0 /* function is not needed */ +/* + * FUNCTION: Write data to a port, without waiting first + */ +static BOOLEAN I8042WriteNoWait(PDEVICE_EXTENSION DevExt, int addr, BYTE data) +{ + WRITE_PORT_UCHAR((PUCHAR)addr,data); + DPRINT("Sent %x to %x\n", data, addr); + return TRUE; +} +#endif + +/* + * FUNCTION: Read data from port 0x60 + */ +NTSTATUS I8042ReadData(BYTE *Data) +{ + BYTE Status; + Status=READ_PORT_UCHAR((PUCHAR)I8042_CTRL_PORT); + + // If data is available + if ((Status & KBD_OBF)) { + Data[0]=READ_PORT_UCHAR((PUCHAR)I8042_DATA_PORT); + + // If the data is valid (not timeout, not parity error) + if ((~Status) & (KBD_GTO | KBD_PERR)) + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS I8042ReadStatus(BYTE *Status) +{ + Status[0]=READ_PORT_UCHAR((PUCHAR)I8042_CTRL_PORT); + return STATUS_SUCCESS; +} + +/* + * FUNCTION: Read data from port 0x60 + */ +NTSTATUS I8042ReadDataWait(PDEVICE_EXTENSION DevExt, BYTE *Data) +{ + ULONG Counter = DevExt->Settings.PollingIterations; + NTSTATUS Status; + + while (Counter--) { + Status = I8042ReadData(Data); + + if (STATUS_SUCCESS == Status) + return Status; + + KeStallExecutionProcessor(50); + } + // Timed out + return STATUS_IO_TIMEOUT; +} + +VOID I8042Flush() +{ + BYTE Ignore; + + while (STATUS_SUCCESS == I8042ReadData(&Ignore)) { + ; /* drop */ + } +} + +VOID STDCALL I8042IsrWritePort(PDEVICE_EXTENSION DevExt, + UCHAR Value, + UCHAR SelectCmd) +{ + if (SelectCmd) + if (!I8042Write(DevExt, I8042_CTRL_PORT, SelectCmd)) + return; + + I8042Write(DevExt, I8042_DATA_PORT, Value); +} + +/* + * These functions are callbacks for filter driver custom + * initialization routines. + */ +NTSTATUS STDCALL I8042SynchWritePort(PDEVICE_EXTENSION DevExt, + UCHAR Port, + UCHAR Value, + BOOLEAN WaitForAck) +{ + NTSTATUS Status; + UCHAR Ack; + UINT ResendIterations = DevExt->Settings.ResendIterations + 1; + + do { + if (Port) + if (!I8042Write(DevExt, I8042_DATA_PORT, Port)) + return STATUS_TIMEOUT; + + if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) + return STATUS_TIMEOUT; + + if (WaitForAck) { + Status = I8042ReadDataWait(DevExt, &Ack); + if (Status != STATUS_SUCCESS) + return Status; + if (Ack == KBD_ACK) + return STATUS_SUCCESS; + if (Ack != KBD_RESEND) + return STATUS_UNEXPECTED_IO_ERROR; + } else { + return STATUS_SUCCESS; + } + ResendIterations--; + } while (ResendIterations); + return STATUS_TIMEOUT; +} + +/* + * This one reads a value from the port; You don't have to specify + * which one, it'll always be from the one you talked to, so one function + * is enough this time. Note how MSDN specifies the + * WaitForAck parameter to be ignored. + */ +static NTSTATUS STDCALL I8042SynchReadPort(PVOID Context, + PUCHAR Value, + BOOLEAN WaitForAck) +{ + PDEVICE_EXTENSION DevExt = (PDEVICE_EXTENSION)Context; + + return I8042ReadDataWait(DevExt, Value); +} + +/* Write the current byte of the packet. Returns FALSE in case + * of problems. + */ +static BOOLEAN STDCALL I8042PacketWrite(PDEVICE_EXTENSION DevExt) +{ + UCHAR Port = DevExt->PacketPort; + + if (Port) { + if (!I8042Write(DevExt, + I8042_CTRL_PORT, + Port)) { + /* something is really wrong! */ + DPRINT1("Failed to send packet byte!\n"); + return FALSE; + } + } + + return I8042Write(DevExt, + I8042_DATA_PORT, + DevExt->Packet.Bytes[DevExt->Packet.CurrentByte]); +} + + +/* + * This function starts a packet. It must be called with the + * correct DIRQL. + */ +NTSTATUS STDCALL I8042StartPacket(PDEVICE_EXTENSION DevExt, + PDEVICE_OBJECT Device, + PUCHAR Bytes, + ULONG ByteCount, + PIRP Irp) +{ + KIRQL Irql; + NTSTATUS Status; + PFDO_DEVICE_EXTENSION FdoDevExt = Device->DeviceExtension; + + Irql = KeAcquireInterruptSpinLock(DevExt->HighestDIRQLInterrupt); + + DevExt->CurrentIrp = Irp; + DevExt->CurrentIrpDevice = Device; + + if (Idle != DevExt->Packet.State) { + Status = STATUS_DEVICE_BUSY; + goto startpacketdone; + } + + DevExt->Packet.Bytes = Bytes; + DevExt->Packet.CurrentByte = 0; + DevExt->Packet.ByteCount = ByteCount; + DevExt->Packet.State = SendingBytes; + DevExt->PacketResult = Status = STATUS_PENDING; + + if (Mouse == FdoDevExt->Type) + DevExt->PacketPort = 0xD4; + else + DevExt->PacketPort = 0; + + if (!I8042PacketWrite(DevExt)) { + Status = STATUS_TIMEOUT; + DevExt->Packet.State = Idle; + DevExt->PacketResult = STATUS_ABANDONED; + goto startpacketdone; + } + + DevExt->Packet.CurrentByte++; + +startpacketdone: + KeReleaseInterruptSpinLock(DevExt->HighestDIRQLInterrupt, Irql); + + if (STATUS_PENDING != Status) { + DevExt->CurrentIrp = NULL; + DevExt->CurrentIrpDevice = NULL; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + return Status; +} + +BOOLEAN STDCALL I8042PacketIsr(PDEVICE_EXTENSION DevExt, + UCHAR Output) +{ + if (Idle == DevExt->Packet.State) + return FALSE; + + switch (Output) { + case KBD_RESEND: + DevExt->PacketResends++; + if (DevExt->PacketResends > DevExt->Settings.ResendIterations) { + DevExt->Packet.State = Idle; + DevExt->PacketComplete = TRUE; + DevExt->PacketResult = STATUS_TIMEOUT; + DevExt->PacketResends = 0; + return TRUE; + } + DevExt->Packet.CurrentByte--; + break; + + case KBD_NACK: + DevExt->Packet.State = Idle; + DevExt->PacketComplete = TRUE; + DevExt->PacketResult = STATUS_UNEXPECTED_IO_ERROR; + DevExt->PacketResends = 0; + return TRUE; + + default: + DevExt->PacketResends = 0; + } + + if (DevExt->Packet.CurrentByte >= DevExt->Packet.ByteCount) { + DevExt->Packet.State = Idle; + DevExt->PacketComplete = TRUE; + DevExt->PacketResult = STATUS_SUCCESS; + return TRUE; + } + + if (!I8042PacketWrite(DevExt)) { + DevExt->Packet.State = Idle; + DevExt->PacketComplete = TRUE; + DevExt->PacketResult = STATUS_TIMEOUT; + return TRUE; + } + DevExt->Packet.CurrentByte++; + + return TRUE; +} + +VOID I8042PacketDpc(PDEVICE_EXTENSION DevExt) +{ + BOOL FinishIrp = FALSE; + NTSTATUS Result = STATUS_INTERNAL_ERROR; /* Shouldn't happen */ + KIRQL Irql; + + /* If the interrupt happens before this is setup, the key + * was already in the buffer. Too bad! */ + if (!DevExt->HighestDIRQLInterrupt) + return; + + Irql = KeAcquireInterruptSpinLock(DevExt->HighestDIRQLInterrupt); + + if (Idle == DevExt->Packet.State && + DevExt->PacketComplete) { + FinishIrp = TRUE; + Result = DevExt->PacketResult; + DevExt->PacketComplete = FALSE; + } + + KeReleaseInterruptSpinLock(DevExt->HighestDIRQLInterrupt, + Irql); + + if (!FinishIrp) + return; + + if (DevExt->CurrentIrp) { + DevExt->CurrentIrp->IoStatus.Status = Result; + IoCompleteRequest(DevExt->CurrentIrp, IO_NO_INCREMENT); + IoStartNextPacket(DevExt->CurrentIrpDevice, FALSE); + DevExt->CurrentIrp = NULL; + DevExt->CurrentIrpDevice = NULL; + } +} + +VOID STDCALL I8042SendHookWorkItem(PDEVICE_OBJECT DeviceObject, + PVOID Context) +{ + KEVENT Event; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PDEVICE_EXTENSION DevExt; + PFDO_DEVICE_EXTENSION FdoDevExt; + PIRP NewIrp; + PI8042_HOOK_WORKITEM WorkItemData = (PI8042_HOOK_WORKITEM)Context; + + ULONG IoControlCode; + PVOID InputBuffer; + ULONG InputBufferLength; + BOOLEAN IsKbd; + + DPRINT("HookWorkItem\n"); + + FdoDevExt = (PFDO_DEVICE_EXTENSION) + DeviceObject->DeviceExtension; + + DevExt = FdoDevExt->PortDevExt; + + if (WorkItemData->Target == DevExt->KeyboardData.ClassDeviceObject) { + IoControlCode = IOCTL_INTERNAL_I8042_HOOK_KEYBOARD; + InputBuffer = &DevExt->KeyboardHook; + InputBufferLength = sizeof(INTERNAL_I8042_HOOK_KEYBOARD); + IsKbd = TRUE; + DPRINT ("is for keyboard.\n"); + } else if (WorkItemData->Target == DevExt->MouseData.ClassDeviceObject){ + IoControlCode = IOCTL_INTERNAL_I8042_HOOK_MOUSE; + InputBuffer = &DevExt->MouseHook; + InputBufferLength = sizeof(INTERNAL_I8042_HOOK_MOUSE); + IsKbd = FALSE; + DPRINT ("is for mouse.\n"); + } else { + DPRINT1("I8042SendHookWorkItem: Can't find DeviceObject\n"); + WorkItemData->Irp->IoStatus.Status = STATUS_INTERNAL_ERROR; + goto hookworkitemdone; + } + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + NewIrp = IoBuildDeviceIoControlRequest( + IoControlCode, + WorkItemData->Target, + InputBuffer, + InputBufferLength, + NULL, + 0, + TRUE, + &Event, + &IoStatus); + + if (!NewIrp) { + DPRINT("IOCTL_INTERNAL_(device)_CONNECT: " + "Can't allocate IRP\n"); + WorkItemData->Irp->IoStatus.Status = + STATUS_INSUFFICIENT_RESOURCES; + goto hookworkitemdone; + } + + Status = IoCallDriver( + WorkItemData->Target, + NewIrp); + + if (STATUS_PENDING == Status) + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + + if (IsKbd) { + /* Call the hooked initialization if it exists */ + if (DevExt->KeyboardHook.InitializationRoutine) { + Status = DevExt->KeyboardHook.InitializationRoutine( + DevExt->KeyboardHook.Context, + DevExt, + I8042SynchReadPort, + I8042SynchWritePortKbd, + FALSE); + if (Status != STATUS_SUCCESS) { + WorkItemData->Irp->IoStatus.Status = Status; + goto hookworkitemdone; + } + } + /* TODO: Now would be the right time to enable the interrupt */ + + DevExt->KeyboardClaimed = TRUE; + } else { + /* Mouse doesn't have this, but we need to send a + * reset to start the detection. + */ + KIRQL Irql; + + Irql = KeAcquireInterruptSpinLock( + DevExt->HighestDIRQLInterrupt); + + I8042Write(DevExt, I8042_CTRL_PORT, 0xD4); + I8042Write(DevExt, I8042_DATA_PORT, 0xFF); + + KeReleaseInterruptSpinLock(DevExt->HighestDIRQLInterrupt, Irql); + } + + WorkItemData->Irp->IoStatus.Status = STATUS_SUCCESS; + +hookworkitemdone: + WorkItemData->Irp->IoStatus.Information = 0; + IoCompleteRequest(WorkItemData->Irp, IO_NO_INCREMENT); + + IoFreeWorkItem(WorkItemData->WorkItem); + ExFreePool(WorkItemData); + DPRINT("HookWorkItem done\n"); +} + +VOID STDCALL I8042StartIo(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + if (!I8042StartIoKbd(DeviceObject, Irp)) { + DPRINT1("Unhandled StartIo!\n"); + } +} + +NTSTATUS STDCALL I8042InternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + PFDO_DEVICE_EXTENSION FdoDevExt = DeviceObject->DeviceExtension; + + DPRINT("InternalDeviceControl\n"); + + switch (FdoDevExt->Type) { + case Keyboard: + Status = I8042InternalDeviceControlKbd(DeviceObject, Irp); + break; + case Mouse: + Status = I8042InternalDeviceControlMouse(DeviceObject, Irp); + break; + } + + if (Status == STATUS_INVALID_DEVICE_REQUEST) { + DPRINT1("Invalid internal device request!\n"); + } + + if (Status != STATUS_PENDING) + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS STDCALL I8042CreateDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NTSTATUS Status; + + DPRINT ("I8042CreateDispatch\n"); + + Status = STATUS_SUCCESS; + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +static NTSTATUS STDCALL I8042BasicDetect(PDEVICE_EXTENSION DevExt) +{ + NTSTATUS Status; + UCHAR Value; + UINT Counter; + + I8042Flush(); + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST)) + return STATUS_TIMEOUT; + + // Wait longer? + Counter = 3; + do { + Status = I8042ReadDataWait(DevExt, &Value); + } while ((Counter--) && (STATUS_TIMEOUT == Status)); + + if (Status != STATUS_SUCCESS) + return Status; + + if (Value != 0x55) { + DPRINT1("Got %x instead of 55\n", Value); + return STATUS_IO_DEVICE_ERROR; + } + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_LINE_TEST)) + return STATUS_TIMEOUT; + + Status = I8042ReadDataWait(DevExt, &Value); + if (Status != STATUS_SUCCESS) + return Status; + + if (Value == 0) { + DevExt->KeyboardExists = TRUE; + } else { + DevExt->KeyboardExists = FALSE; + } + + if (!I8042Write(DevExt, I8042_CTRL_PORT, MOUSE_LINE_TEST)) + return STATUS_TIMEOUT; + + Status = I8042ReadDataWait(DevExt, &Value); + if (Status != STATUS_SUCCESS) + return Status; + + if (Value == 0) { + DevExt->MouseExists = TRUE; + } else { + DevExt->MouseExists = FALSE; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL I8042Initialize(PDEVICE_EXTENSION DevExt) +{ + NTSTATUS Status; + + Status = I8042BasicDetect(DevExt); + if (Status != STATUS_SUCCESS) { + DPRINT1("Basic keyboard detection failed: %x\n", Status); + return Status; + } + + if (!DevExt->KeyboardExists) { + DPRINT("Keyboard not detected\n") + if (DevExt->Settings.Headless) + /* Act as if it exists regardless */ + DevExt->KeyboardExists = TRUE; + } else { + DPRINT("Keyboard detected\n"); + DevExt->KeyboardExists = I8042DetectKeyboard(DevExt); + } + + if (DevExt->KeyboardExists) { + I8042KeyboardEnable(DevExt); + I8042KeyboardEnableInterrupt(DevExt); + } + + if (DevExt->MouseExists) + I8042MouseEnable(DevExt); + + return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL I8042AddDevice(PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT Pdo) +{ + UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Device\\KeyboardClass0"); + UNICODE_STRING MouseName = ROS_STRING_INITIALIZER(L"\\Device\\PointerClass0"); + ULONG MappedIrqKeyboard = 0, MappedIrqMouse = 0; + KIRQL DirqlKeyboard = 0; + KIRQL DirqlMouse = 0; + KIRQL DirqlMax; + KAFFINITY Affinity; + NTSTATUS Status; + PDEVICE_EXTENSION DevExt; + PFDO_DEVICE_EXTENSION FdoDevExt; + PDEVICE_OBJECT Fdo; + + DPRINT("I8042AddDevice\n"); + + IoCreateDevice(DriverObject, + sizeof(DEVICE_EXTENSION), + NULL, + FILE_DEVICE_8042_PORT, + FILE_DEVICE_SECURE_OPEN, + TRUE, + &Fdo); + + IoAttachDeviceToDeviceStack(Fdo, Pdo); + + DevExt = Fdo->DeviceExtension; + + RtlZeroMemory(DevExt, sizeof(DEVICE_EXTENSION)); + + I8042ReadRegistry(DriverObject, DevExt); + + KeInitializeSpinLock(&DevExt->SpinLock); + InitializeListHead(&DevExt->BusDevices); + + KeInitializeDpc(&DevExt->DpcKbd, + I8042DpcRoutineKbd, + DevExt); + + KeInitializeDpc(&DevExt->DpcMouse, + I8042DpcRoutineMouse, + DevExt); + + KeInitializeDpc(&DevExt->DpcMouseTimeout, + I8042DpcRoutineMouseTimeout, + DevExt); + + KeInitializeTimer(&DevExt->TimerMouseTimeout); + + Status = I8042Initialize(DevExt); + if (STATUS_SUCCESS != Status) { + DPRINT1("Initialization failure: %x\n", Status); + return Status; + } + + if (DevExt->KeyboardExists) { + MappedIrqKeyboard = HalGetInterruptVector(Internal, + 0, + 0, + KEYBOARD_IRQ, + &DirqlKeyboard, + &Affinity); + + Status = IoCreateDevice(DriverObject, + sizeof(FDO_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_8042_PORT, + FILE_DEVICE_SECURE_OPEN, + TRUE, + &Fdo); + + FdoDevExt = Fdo->DeviceExtension; + + RtlZeroMemory(FdoDevExt, sizeof(FDO_DEVICE_EXTENSION)); + + FdoDevExt->PortDevExt = DevExt; + FdoDevExt->Type = Keyboard; + FdoDevExt->DeviceObject = Fdo; + + Fdo->Flags |= DO_BUFFERED_IO; + + DevExt->DebugWorkItem = IoAllocateWorkItem(Fdo); + DevExt->KeyboardObject = Fdo; + + DevExt->KeyboardBuffer = ExAllocatePoolWithTag( + NonPagedPool, + DevExt->KeyboardAttributes.InputDataQueueLength * + sizeof(KEYBOARD_INPUT_DATA), + TAG_I8042); + + if (!DevExt->KeyboardBuffer) { + DPRINT1("No memory for keyboardbuffer\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); + } + + if (DevExt->MouseExists) { + MappedIrqMouse = HalGetInterruptVector(Internal, + 0, + 0, + MOUSE_IRQ, + &DirqlMouse, + &Affinity); + + Status = IoCreateDevice(DriverObject, + sizeof(FDO_DEVICE_EXTENSION), + &MouseName, + FILE_DEVICE_8042_PORT, + FILE_DEVICE_SECURE_OPEN, + TRUE, + &Fdo); + + FdoDevExt = Fdo->DeviceExtension; + + RtlZeroMemory(FdoDevExt, sizeof(FDO_DEVICE_EXTENSION)); + + FdoDevExt->PortDevExt = DevExt; + FdoDevExt->Type = Mouse; + FdoDevExt->DeviceObject = Fdo; + + Fdo->Flags |= DO_BUFFERED_IO; + DevExt->MouseObject = Fdo; + + DevExt->MouseBuffer = ExAllocatePoolWithTag( + NonPagedPool, + DevExt->MouseAttributes.InputDataQueueLength * + sizeof(MOUSE_INPUT_DATA), + TAG_I8042); + + if (!DevExt->MouseBuffer) { + ExFreePool(DevExt->KeyboardBuffer); + DPRINT1("No memory for mouse buffer\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); + } + + if (DirqlKeyboard > DirqlMouse) + DirqlMax = DirqlKeyboard; + else + DirqlMax = DirqlMouse; + + if (DevExt->KeyboardExists) { + Status = IoConnectInterrupt(&DevExt->KeyboardInterruptObject, + I8042InterruptServiceKbd, + (PVOID)DevExt, + &DevExt->SpinLock, + MappedIrqKeyboard, + DirqlKeyboard, + DirqlMax, + LevelSensitive, + FALSE, + Affinity, + FALSE); + + DPRINT("Keyboard Irq Status: %x\n", Status); + } + + if (DevExt->MouseExists) { + Status = IoConnectInterrupt(&DevExt->MouseInterruptObject, + I8042InterruptServiceMouse, + (PVOID)DevExt, + &DevExt->SpinLock, + MappedIrqMouse, + DirqlMouse, + DirqlMax, + LevelSensitive, + FALSE, [truncated at 1000 lines; 4079 more skipped]

19 years, 4 months

[greatlrd] 14925: reverted them back from ekohl change it create

by greatlrd＠svn.reactos.com

reverted them back from ekohl change it create alot of problem example chater are not being display right if you switch reactos to another langues. Modified: trunk/reactos/subsys/system/cmd/config.h _____ Modified: trunk/reactos/subsys/system/cmd/config.h --- trunk/reactos/subsys/system/cmd/config.h 2005-05-01 20:20:59 UTC (rev 14924) +++ trunk/reactos/subsys/system/cmd/config.h 2005-05-01 20:30:41 UTC (rev 14925) @@ -52,13 +52,9 @@ /* Define one of these to select the used locale. */ /* (date and time formats etc.) used in DATE, TIME, */ /* DIR, PROMPT etc. */ -#ifdef __REACTOS__ -#define LOCALE_DEFAULT -#else #define LOCALE_WINDOWS /* System locale */ /* #define LOCALE_GERMAN */ /* German locale */ /* #define LOCALE_DEFAULT */ /* United States locale */ -#endif #ifndef __REACTOS__ #define INCLUDE_CMD_ACTIVATE

19 years, 4 months

[hpoussin] 14924: Please give names to your PDOs. Should correct the boot on non-ACPI systems.

by hpoussin＠svn.reactos.com

Please give names to your PDOs. Should correct the boot on non-ACPI systems. Modified: trunk/reactos/ntoskrnl/io/pnproot.c _____ Modified: trunk/reactos/ntoskrnl/io/pnproot.c --- trunk/reactos/ntoskrnl/io/pnproot.c 2005-05-01 20:12:06 UTC (rev 14923) +++ trunk/reactos/ntoskrnl/io/pnproot.c 2005-05-01 20:20:59 UTC (rev 14924) @@ -130,7 +130,7 @@ sizeof(PNPROOT_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_CONTROLLER, - 0, + FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &Device->Pdo); if (!NT_SUCCESS(Status)) {

19 years, 4 months

[mf] 14923: more rosshell separations

by mf＠svn.reactos.com

more rosshell separations Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.h Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc Modified: branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.h --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.h 2005-05-01 20:02:30 UTC (rev 14922) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.h 2005-05-01 20:12:06 UTC (rev 14923) @@ -54,4 +54,7 @@ #include "shell/shellbrowser.h" + +#ifndef ROSSHELL #include "shell/mainframe.h" +#endif _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc --- branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 20:02:30 UTC (rev 14922) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer_intres.rc 2005-05-01 20:12:06 UTC (rev 14923) @@ -83,7 +83,6 @@ IDS_TITLE "ReactOS Explorer" IDS_START "?ncepe" IDS_LOGOFF "?nchide sesiunea ..." - IDS_TERMINATE "?nchide" IDS_SHUTDOWN "Oprire calculator ..." IDS_LAUNCH "Pornire ..." IDS_START_HELP "Ajutor" @@ -100,6 +99,14 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Desktop %d" + IDS_TERMINATE "?nchide" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "Re?ea" IDS_CONNECTIONS "Conec?ii" IDS_DRIVES "Discuri" @@ -116,13 +123,6 @@ IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Desktop %d" -END - #endif // Romanian resources //////////////////////////////////////////////////////////////////////// ///// @@ -141,7 +141,6 @@ // Bitmap // -IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" IDB_LOGOV BITMAP DISCARDABLE "res/logov.bmp" IDB_LOGOV256 BITMAP DISCARDABLE "res/logov256.bmp" IDB_LOGOV16 BITMAP DISCARDABLE "res/logov16.bmp" @@ -259,6 +258,7 @@ 3 TEXTINCLUDE DISCARDABLE BEGIN + "IDB_TOOLBAR BITMAP DISCARDABLE ""res/toolbar.bmp""\r\n" "#ifndef _ROS_\r\n" "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r\n" "STRINGTABLE DISCARDABLE \r\n" @@ -339,7 +339,6 @@ IDS_TITLE "Reactos Explorer" IDS_START "Start" IDS_LOGOFF "Abmelden..." - IDS_TERMINATE "ROS Explorer beenden" IDS_SHUTDOWN "Herunterfahren..." IDS_LAUNCH "Starten..." IDS_START_HELP "Hilfe" @@ -356,6 +355,14 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "alle Fenster minimieren" + IDS_DESKTOP_NUM "Desktop %d" + IDS_TERMINATE "ROS Explorer beenden" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "Netzwerk" IDS_CONNECTIONS "Netzwerk-Verbindungen" IDS_DRIVES "Verzeichnisse" @@ -372,13 +379,6 @@ IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "alle Fenster minimieren" - IDS_DESKTOP_NUM "Desktop %d" -END - #endif // German (Germany) resources //////////////////////////////////////////////////////////////////////// ///// @@ -553,7 +553,6 @@ IDS_TITLE "Reactos Explorer" IDS_START "Start" IDS_LOGOFF "Log Off..." - IDS_TERMINATE "Terminate ROS Explorer" IDS_SHUTDOWN "Turn Off..." IDS_LAUNCH "Run..." IDS_START_HELP "Help" @@ -570,6 +569,14 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Desktop %d" + IDS_TERMINATE "Terminate ROS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "Network" IDS_CONNECTIONS "Network Connections" IDS_DRIVES "Drives" @@ -586,13 +593,6 @@ IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Desktop %d" -END - #endif // English (U.S.) resources //////////////////////////////////////////////////////////////////////// ///// @@ -668,7 +668,6 @@ IDS_TITLE "Explorateur Reactos" IDS_START "DÚmarrer" IDS_LOGOFF "DÚconnexion ..." - IDS_TERMINATE "DÚconnexion" IDS_SHUTDOWN "ArrÛter..." IDS_LAUNCH "ExÚcuter..." IDS_START_HELP "Aide" @@ -685,6 +684,14 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Bureau %d" + IDS_TERMINATE "DÚconnexion" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "RÚseaux" IDS_CONNECTIONS "Connexions rÚseaux" IDS_DRIVES "Disques" @@ -701,13 +708,6 @@ IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Bureau %d" -END - #endif // French (France) resources //////////////////////////////////////////////////////////////////////// ///// @@ -753,7 +753,6 @@ IDS_TITLE "Explorador do Reactos" IDS_START "Iniciar" IDS_LOGOFF "Terminar sessÒo..." - IDS_TERMINATE "Terminar ROS Explorer" IDS_SHUTDOWN "Desligar..." IDS_LAUNCH "Executar..." IDS_START_HELP "Ajuda" @@ -770,6 +769,14 @@ STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "Startmenu" + IDS_MINIMIZE_ALL "mimimize all windows" + IDS_DESKTOP_NUM "Desktop %d" + IDS_TERMINATE "Terminar ROS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "Rede" IDS_CONNECTIONS "Conecþ§es da rede" IDS_DRIVES "Drives" @@ -786,13 +793,6 @@ IDS_TASKBAR "Taskbar" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" - IDS_DESKTOP_NUM "Desktop %d" -END - #endif // Portuguese (Portugal) resources //////////////////////////////////////////////////////////////////////// ///// @@ -803,6 +803,7 @@ // // Generated from the TEXTINCLUDE 3 resource. // +IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" #ifndef _ROS_ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp --- branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 20:02:30 UTC (rev 14922) +++ branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 20:12:06 UTC (rev 14923) @@ -233,6 +233,10 @@ # End Source File # Begin Source File +SOURCE=.\res\explorer.ico +# End Source File +# Begin Source File + SOURCE=.\explorer_intres.h # End Source File # Begin Source File @@ -386,6 +390,10 @@ # End Source File # Begin Source File +SOURCE=.\shell\shellbrowser.h +# End Source File +# Begin Source File + SOURCE=.\shell\shellfs.cpp # End Source File # Begin Source File

19 years, 4 months

[mf] 14922: experimental ROS Shell without integrated explorer part

by mf＠svn.reactos.com

experimental ROS Shell without integrated explorer part Added: branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.MinG W Added: branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.mak Modified: branches/lean-explorer/reactos/subsys/system/explorer/Makefile Modified: branches/lean-explorer/reactos/subsys/system/explorer/Makefile.MinGW Modified: branches/lean-explorer/reactos/subsys/system/explorer/Makefile.PCH Modified: branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/globals.h Added: branches/lean-explorer/reactos/subsys/system/explorer/make_rosshell.dsp Added: branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp Added: branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsw Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/desktopbar .cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/utility/utility.h _____ Added: branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.MinG W --- branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.MinG W 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.MinG W 2005-05-01 20:02:30 UTC (rev 14922) @@ -0,0 +1,83 @@ +# +# ReactOS lean shell +# +# Make-rosshell.MinGW +# +# MinGW Makefile with precompiled header support +# + +CC = gcc +CXX = g++ +LINK = g++ + +CFLAGS = -DWIN32 -DROSSHELL -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall -I. +RCFLAGS = -DWIN32 -DROSSHELL -D__WINDRES__ +LFLAGS = -Wl,--subsystem,windows + +ifdef DEBUG +CFLAGS += -D_DEBUG -g +RCFLAGS += -D_DEBUG +LFLAGS += -g +else +CFLAGS += -DNDEBUG -Os -D_NO_CONTEXT +RCFLAGS += -DNDEBUG +LFLAGS += -s +endif + +ifndef UNICODE +UNICODE = 1 +endif + +ifeq ($(UNICODE),1) +CFLAGS += -DUNICODE +# LFLAGS+= -Wl,--entry,_wWinMain@16 +endif + +CXXFLAGS = $(CFLAGS) + +EXEC_SUFFIX = .exe +RES_SUFFIX = .coff + +VPATH = shell utility taskbar desktop dialogs + +PROGRAM = rosshell + +TARGET = $(PROGRAM)$(EXEC_SUFFIX) + +OBJECTS = \ + startup.o \ + shellclasses.o \ + utility.o \ + window.o \ + dragdropimpl.o \ + shellbrowserimpl.o \ + explorer.o \ + entries.o \ + winfs.o \ + shellfs.o \ + desktop.o \ + desktopbar.o \ + taskbar.o \ + startmenu.o \ + traynotify.o \ + quicklaunch.o \ + settings.o + +LIBS = gdi32 comctl32 ole32 uuid + +all: precomp.h.gch $(TARGET) + +precomp.h.gch: *.h utility/*.h shell/*.h desktop/*.h + $(CXX) $(CFLAGS) precomp.h + +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) + $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) + +$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico + windres $(RCFLAGS) -o $@ explorer_intres.rc + +clean: + rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch \ + desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o + +ever: _____ Added: branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.mak --- branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.mak 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/Make-rosshell.mak 2005-05-01 20:02:30 UTC (rev 14922) @@ -0,0 +1,148 @@ +# +# ReactOS lean shell +# +# Makefile +# + +# Windows is default host environment +ifeq ($(HOST),) +HOST = mingw32-windows +endif + +ifeq ($(HOST),mingw32-linux) +CC = mingw32-gcc +CXX = mingw32-g++ +LINK = mingw32-g++ +RC = mingw32-windres +CD_PREFIX := ./ +PREFIX = mingw32- +EXE_POSTFIX := +EXE_PREFIX := ./ +endif + +ifeq ($(HOST),mingw32-windows) +CC = gcc +CXX = g++ +LINK = g++ +RC = windres +CD_PREFIX := +PREFIX = +EXE_PREFIX := +EXE_POSTFIX := .exe +endif + +PATH_TO_TOP = ../../.. +TOOLS_PATH = $(PATH_TO_TOP)/tools + +ifndef UNICODE +UNICODE = 1 +endif + +CFLAGS = -I./ -DWIN32 -D_ROS_ -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall +RCFLAGS = -DWIN32 -D_ROS_ -D__WINDRES__ +LFLAGS = -Wl,--subsystem,windows + +ifdef DEBUG +CFLAGS += -D_DEBUG -g +RCFLAGS += -D_DEBUG +LFLAGS += -g +else +CFLAGS += -DNDEBUG -Os -D_NO_CONTEXT +RCFLAGS += -DNDEBUG +LFLAGS += -s +endif + +ifeq ($(UNICODE),1) +CFLAGS += -DUNICODE +# LFLAGS+= -Wl,--entry,_wWinMain@16 +RCFLAGS += -DUNICODE +endif + +CXXFLAGS = $(CFLAGS) + +EXEC_SUFFIX = .exe +RES_SUFFIX = .coff + +VPATH = shell utility taskbar desktop dialogs + +PROGRAM = rosshell + +TARGET = $(PROGRAM)$(EXEC_SUFFIX) + +OBJECTS = \ + startup.o \ + shellclasses.o \ + utility.o \ + window.o \ + dragdropimpl.o \ + shellbrowserimpl.o \ + explorer.o \ + entries.o \ + winfs.o \ + shellfs.o \ + desktop.o \ + desktopbar.o \ + taskbar.o \ + startmenu.o \ + traynotify.o \ + quicklaunch.o \ + settings.o + +LIBS = gdi32 comctl32 ole32 uuid + +.PHONY: all depends implib clean install dist bootcd depends + +all: $(TARGET) + +ever: + +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) + $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) + +$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico + $(RC) $(RCFLAGS) -o $@ explorer_intres.rc + +clean: + $(TOOLS_PATH)/rdel $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) \ + desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o + +# Use environment var ROS_INSTALL to override default install dir +ifneq ($(ROS_INSTALL),) +INSTALL_DIR = $(ROS_INSTALL) +else +ifeq ($(HOST),mingw32-windows) +INSTALL_DIR = C:/reactos +else +INSTALL_DIR = $(PATH_TO_TOP)/reactos +endif +endif + +implib: + +install: + -$(TOOLS_PATH)/rcopy $(TARGET) $(INSTALL_DIR)/$(TARGET) + +bootcd: + + +# dependency scanning + +DEP_FILTERED := $(filter-out $(DEP_EXCLUDE_FILTER), $(OBJECTS:.o=.d)) +DEP_FILES := $(join $(dir $(DEP_FILTERED)), $(addprefix ., $(notdir $(DEP_FILTERED)))) + +ifneq ($(MAKECMDGOALS),clean) +-include $(DEP_FILES) +endif + +ifeq ($(HOST),mingw32-windows) +DEPENDS_EXE := ..\..\..\tools\depends +else +DEPENDS_EXE := $(TOOLS_PATH)/depends +endif + +.%.d: %.c $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) + $(CC) $(CFLAGS) -M $< | $(DEPENDS_EXE) $(@D) $@ + +.%.d: %.cpp $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) + $(CC) $(CFLAGS) -M $< | $(DEPENDS_EXE) $(@D) $@ + _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/Makefile --- branches/lean-explorer/reactos/subsys/system/explorer/Makefile 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/Makefile 2005-05-01 20:02:30 UTC (rev 14922) @@ -1,5 +1,5 @@ # -# ReactOS lean explorer +# ReactOS lean shell # # Makefile # @@ -101,8 +101,8 @@ $(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) -explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico - $(RC) $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc +explorer$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico + $(RC) $(RCFLAGS) -o $@ explorer_intres.rc clean: $(TOOLS_PATH)/rdel $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) \ _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/Makefile.MinGW --- branches/lean-explorer/reactos/subsys/system/explorer/Makefile.MinGW 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/Makefile.MinGW 2005-05-01 20:02:30 UTC (rev 14922) @@ -71,7 +71,7 @@ $(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) -explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico +$(PROGRAM)$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc clean: _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/Makefile.PCH --- branches/lean-explorer/reactos/subsys/system/explorer/Makefile.PCH 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/Makefile.PCH 2005-05-01 20:02:30 UTC (rev 14922) @@ -75,8 +75,8 @@ $(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) -explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico - windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc +$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico + windres $(RCFLAGS) -o $@ explorer_intres.rc clean: rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch \ _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p --- branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p 2005-05-01 20:02:30 UTC (rev 14922) @@ -382,8 +382,10 @@ HRESULT DesktopWindow::OnDefaultCommand(LPIDA pida) { +#ifndef ROSSHELL // in shell-only-mode fall through and let shell32 handle the command if (MainFrame::OpenShellFolders(pida, 0)) return S_OK; +#endif return E_NOTIMPL; } _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-05-01 20:02:30 UTC (rev 14922) @@ -44,11 +44,15 @@ ExplorerGlobals::ExplorerGlobals() { _hInstance = 0; + _cfStrFName = 0; + +#ifndef ROSSHELL _hframeClass = 0; - _cfStrFName = 0; _hMainWnd = 0; + _desktop_mode = false; _prescan_nodes = false; - _desktop_mode = false; +#endif + _log = NULL; #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) _SHRestricted = 0; @@ -413,6 +417,8 @@ } +#ifndef ROSSHELL + void explorer_show_frame(int cmdshow, LPTSTR lpCmdLine) { if (g_Globals._hMainWnd) { @@ -454,7 +460,19 @@ } } +#else +void explorer_show_frame(int cmdshow, LPTSTR lpCmdLine) +{ + if (!lpCmdLine) + lpCmdLine = TEXT("explorer.exe"); + + launch_file(GetDesktopWindow(), lpCmdLine, cmdshow); +} + +#endif + + PopupMenu::PopupMenu(UINT nid) { HMENU hMenu = LoadMenu(g_Globals._hInstance, MAKEINTRESOURCE(nid)); @@ -534,6 +552,7 @@ setlocale(LC_COLLATE, ""); // set collating rules to local settings for compareName +#ifndef ROSSHELL // register frame window class g_Globals._hframeClass = IconWindowClass(CLASSNAME_FRAME,IDI_EXPLORER); @@ -542,6 +561,7 @@ // register tree windows class WindowClass(CLASSNAME_WINEFILETREE, CS_CLASSDC|CS_DBLCLKS|CS_VREDRAW).Register(); +#endif g_Globals._cfStrFName = RegisterClipboardFormat(CFSTR_FILENAME); } @@ -561,6 +581,7 @@ return -1; } +#ifndef ROSSHELL if (cmdshow != SW_HIDE) { /* // don't maximize if being called from the ROS desktop if (cmdshow == SW_SHOWNORMAL) @@ -570,6 +591,7 @@ explorer_show_frame(cmdshow, lpCmdLine); } +#endif return Window::MessageLoop(); } @@ -684,12 +706,14 @@ // If there is given the command line option "-desktop", create desktop window anyways if (_tcsstr(lpCmdLine,TEXT("-desktop"))) startup_desktop = TRUE; +#ifndef ROSSHELL else if (_tcsstr(lpCmdLine,TEXT("-nodesktop"))) startup_desktop = FALSE; // Don't display cabinet window in desktop mode if (startup_desktop && !_tcsstr(lpCmdLine,TEXT("-explorer"))) nShowCmd = SW_HIDE; +#endif if (_tcsstr(lpCmdLine,TEXT("-noautostart"))) autostart = false; @@ -704,6 +728,10 @@ if (g_SHDOCVW_ShellDDEInit) (*g_SHDOCVW_ShellDDEInit)(TRUE); } +#ifdef ROSSHELL + else + return 0; // no shell to launch, so exit immediatelly +#endif g_Globals.init(hInstance); @@ -723,6 +751,7 @@ } } +#ifndef ROSSHELL /**TODO fix command line handling */ if (*lpCmdLine=='"' && lpCmdLine[_tcslen(lpCmdLine)-1]=='"') { ++lpCmdLine; @@ -731,6 +760,7 @@ if (g_Globals._hwndDesktop) g_Globals._desktop_mode = true; +#endif int ret = explorer_main(hInstance, lpCmdLine, nShowCmd); _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/globals.h --- branches/lean-explorer/reactos/subsys/system/explorer/globals.h 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/globals.h 2005-05-01 20:02:30 UTC (rev 14922) @@ -178,11 +178,14 @@ void init(HINSTANCE hInstance); HINSTANCE _hInstance; + UINT _cfStrFName; + +#ifndef ROSSHELL ATOM _hframeClass; - UINT _cfStrFName; HWND _hMainWnd; + bool _desktop_mode; bool _prescan_nodes; - bool _desktop_mode; +#endif FILE* _log; _____ Added: branches/lean-explorer/reactos/subsys/system/explorer/make_rosshell.dsp --- branches/lean-explorer/reactos/subsys/system/explorer/make_rosshell.dsp 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/make_rosshell.dsp 2005-05-01 20:02:30 UTC (rev 14922) @@ -0,0 +1,143 @@ +# Microsoft Developer Studio Project File - Name="make_rosshell" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=make_rosshell - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "make_rosshell.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "make_rosshell.mak" CFG="make_rosshell - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "make_rosshell - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "make_rosshell - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE "make_rosshell - Win32 Unicode Debug" (based on "Win32 (x86) External Target") +!MESSAGE "make_rosshell - Win32 Unicode Release" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "make_rosshell - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Cmd_Line "NMAKE /f make_rosshell.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "make_rosshell.exe" +# PROP BASE Bsc_Name "make_rosshell.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Make-rosshell.MinGW UNICODE=0" +# PROP Rebuild_Opt "clean all" +# PROP Target_File "explorer.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Cmd_Line "NMAKE /f make_rosshell.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "make_rosshell.exe" +# PROP BASE Bsc_Name "make_rosshell.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Make-rosshell.MinGW UNICODE=0 DEBUG=1" +# PROP Rebuild_Opt "clean all" +# PROP Target_File "explorer.exe" +# PROP Bsc_Name "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW UNICODE=0 DEBUG=1" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "UDebug" +# PROP BASE Intermediate_Dir "UDebug" +# PROP BASE Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW UNICODE=1 DEBUG=1" +# PROP BASE Rebuild_Opt "clean all" +# PROP BASE Target_File "explorer.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "UDebug" +# PROP Intermediate_Dir "UDebug" +# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Make-rosshell.MinGW UNICODE=1 DEBUG=1" +# PROP Rebuild_Opt "clean all" +# PROP Target_File "explorer.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "URelease" +# PROP BASE Intermediate_Dir "URelease" +# PROP BASE Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW UNICODE=1" +# PROP BASE Rebuild_Opt "clean all" +# PROP BASE Target_File "explorer.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "URelease" +# PROP Intermediate_Dir "URelease" +# PROP Cmd_Line "make -f Make-rosshell.MinGW UNICODE=1" +# PROP Rebuild_Opt "clean all" +# PROP Target_File "explorer.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "make_rosshell - Win32 Release" +# Name "make_rosshell - Win32 Debug" +# Name "make_rosshell - Win32 Unicode Debug" +# Name "make_rosshell - Win32 Unicode Release" + +!IF "$(CFG)" == "make_rosshell - Win32 Release" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Debug" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Unicode Debug" + +!ELSEIF "$(CFG)" == "make_rosshell - Win32 Unicode Release" + +!ENDIF + +# Begin Source File + +SOURCE=".\Make-rosshell.mak" +# End Source File +# Begin Source File + +SOURCE=".\Make-rosshell.MinGW" +# End Source File +# End Target +# End Project Property changes on: branches/lean-explorer/reactos/subsys/system/explorer/make_rosshell.dsp ___________________________________________________________________ Name: svn:eol-style + CRLF _____ Added: branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp --- branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 19:46:51 UTC (rev 14921) +++ branches/lean-explorer/reactos/subsys/system/explorer/rosshell.dsp 2005-05-01 20:02:30 UTC (rev 14922) @@ -0,0 +1,451 @@ +# Microsoft Developer Studio Project File - Name="rosshell" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=rosshell - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "rosshell.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "rosshell.mak" CFG="rosshell - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "rosshell - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "rosshell - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "rosshell - Win32 Unicode Release" (based on "Win32 (x86) Console Application") +!MESSAGE "rosshell - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "rosshell - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O1 /D "NDEBUG" /D "_NO_CONTEXT" /D "WIN32" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /Yu"precomp.h" /FD /c +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /machine:I386 +# SUBTRACT LINK32 /pdb:none /force + +!ELSEIF "$(CFG)" == "rosshell - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /GZ /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# SUBTRACT LINK32 /pdb:none /force + +!ELSEIF "$(CFG)" == "rosshell - Win32 Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "URelease" +# PROP BASE Intermediate_Dir "URelease" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "URelease" +# PROP Intermediate_Dir "URelease" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "NDEBUG" /D "UNICODE" /D "_NO_CONTEXT" /D "WIN32" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /Yu"precomp.h" /FD /c +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /machine:I386 +# SUBTRACT LINK32 /pdb:none /force + +!ELSEIF "$(CFG)" == "rosshell - Win32 Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "UDebug" +# PROP BASE Intermediate_Dir "UDebug" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "UDebug" +# PROP Intermediate_Dir "UDebug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "UNICODE" /D "_ROS_" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D "WIN32" /D _WIN32_IE=0x0501 /D _WIN32_WINNT=0x0501 /D "ROSSHELL" /FR /Yu"precomp.h" /FD /GZ /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# SUBTRACT LINK32 /pdb:none /force + +!ENDIF + +# Begin Target + +# Name "rosshell - Win32 Release" +# Name "rosshell - Win32 Debug" +# Name "rosshell - Win32 Unicode Release" +# Name "rosshell - Win32 Unicode Debug" +# Begin Group "utility" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\utility\dragdropimpl.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\dragdropimpl.h +# End Source File +# Begin Source File + +SOURCE=.\utility\shellbrowserimpl.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\shellbrowserimpl.h +# End Source File +# Begin Source File + +SOURCE=.\utility\shellclasses.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\shellclasses.h +# End Source File +# Begin Source File + +SOURCE=.\utility\treedroptarget.h +# End Source File +# Begin Source File + +SOURCE=.\utility\utility.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\utility.h +# End Source File +# Begin Source File + +SOURCE=.\utility\window.cpp +# End Source File +# Begin Source File + +SOURCE=.\utility\window.h +# End Source File +# End Group +# Begin Group "resources" + +# PROP Default_Filter "bmp,ico" +# Begin Source File + +SOURCE=.\res\action.ico +# End Source File +# Begin Source File + +SOURCE=.\res\appicon.ico +# End Source File +# Begin Source File + +SOURCE=.\res\apps.ico +# End Source File +# Begin Source File + +SOURCE=.\res\arrow.ico +# End Source File +# Begin Source File + +SOURCE=.\res\arrow_dwn.ico +# End Source File +# Begin Source File + +SOURCE=.\res\arrow_up.ico +# End Source File +# Begin Source File + +SOURCE=.\res\arrowsel.ico +# End Source File +# Begin Source File + +SOURCE=.\res\computer.ico +# End Source File +# Begin Source File + +SOURCE=.\res\config.ico +# End Source File +# Begin Source File + +SOURCE=.\res\documents.ico +# End Source File +# Begin Source File + +SOURCE=.\explorer_intres.h +# End Source File +# Begin Source File + +SOURCE=.\explorer_intres.rc +# End Source File +# Begin Source File + +SOURCE=.\res\favorites.ico +# End Source File +# Begin Source File + +SOURCE=.\res\floating.ico +# End Source File +# Begin Source File + +SOURCE=.\res\folder.ico +# End Source File +# Begin Source File + +SOURCE=.\res\images.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\info.ico +# End Source File +# Begin Source File + +SOURCE=.\res\logoff.ico +# End Source File +# Begin Source File + +SOURCE=.\res\logov.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\logov16.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\logov256.bmp +# End Source File +# Begin Source File + +SOURCE=.\res\network.ico +# End Source File +# Begin Source File + +SOURCE=.\res\printer.ico +# End Source File +# Begin Source File + +SOURCE=.\res\reactos.ico +# End Source File +# Begin Source File + +SOURCE=".\res\ros-big.ico" +# End Source File +# Begin Source File + +SOURCE=".\rosshell-jp.rc" +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + +SOURCE=.\res\rosshell.ico +# End Source File +# Begin Source File + +SOURCE=".\res\search-doc.ico" +# End Source File +# Begin Source File + +SOURCE=.\res\search.ico +# End Source File +# Begin Source File + +SOURCE=.\res\startmenu.ico +# End Source File +# Begin Source File + +SOURCE=.\res\toolbar.bmp +# End Source File +# End Group +# Begin Group "taskbar" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\taskbar\desktopbar.cpp +# End Source File +# Begin Source File + +SOURCE=.\taskbar\desktopbar.h +# End Source File +# Begin Source File + +SOURCE=.\taskbar\quicklaunch.cpp +# End Source File +# Begin Source File + +SOURCE=.\taskbar\quicklaunch.h +# End Source File +# Begin Source File + +SOURCE=.\taskbar\startmenu.cpp +# End Source File +# Begin Source File + +SOURCE=.\taskbar\startmenu.h +# End Source File +# Begin Source File + +SOURCE=.\taskbar\taskbar.cpp +# End Source File +# Begin Source File + +SOURCE=.\taskbar\taskbar.h +# End Source File +# Begin Source File + +SOURCE=.\taskbar\traynotify.cpp +# End Source File +# Begin Source File + +SOURCE=.\taskbar\traynotify.h +# End Source File +# End Group +# Begin Group "desktop" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\desktop\desktop.cpp +# End Source File +# Begin Source File + +SOURCE=.\desktop\desktop.h +# End Source File +# End Group +# Begin Group "shell" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\shell\entries.cpp +# End Source File +# Begin Source File + +SOURCE=.\shell\entries.h +# End Source File +# Begin Source File + +SOURCE=.\shell\shellfs.cpp +# End Source File +# Begin Source File [truncated at 1000 lines; 232 more skipped]

19 years, 4 months

[ion] 14921: Fix IopCloseFile: Use IRP_SYNC_API flag, use local stack event, get the right deviceobject if FO_DIRECT_DEVICE_OPEN is set, set IRP_CLOSE_OPERATION flag.

by ion＠svn.reactos.com

Fix IopCloseFile: Use IRP_SYNC_API flag, use local stack event, get the right deviceobject if FO_DIRECT_DEVICE_OPEN is set, set IRP_CLOSE_OPERATION flag. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-01 19:36:00 UTC (rev 14920) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-01 19:46:51 UTC (rev 14921) @@ -183,7 +183,6 @@ NTSTATUS Status; KEVENT Event; PDEVICE_OBJECT DeviceObject; - IO_STATUS_BLOCK IoStatusBlock; DPRINT("IopDeleteFile()\n"); @@ -208,9 +207,9 @@ /* Set it up */ Irp->UserEvent = &Event; - Irp->UserIosb = &IoStatusBlock; + Irp->UserIosb = &Irp->IoStatus; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->Tail.Overlay.OriginalFileObject= FileObject; + Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API; /* Set up Stack Pointer Data */ @@ -493,48 +492,54 @@ IopCloseFile(PVOID ObjectBody, ULONG HandleCount) { - PFILE_OBJECT FileObject = (PFILE_OBJECT)ObjectBody; - PIRP Irp; - PIO_STACK_LOCATION StackPtr; - NTSTATUS Status; + PFILE_OBJECT FileObject = (PFILE_OBJECT)ObjectBody; + KEVENT Event; + PIRP Irp; + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; - DPRINT("IopCloseFile()\n"); + DPRINT("IopCloseFile()\n"); - if (HandleCount > 1 || FileObject->DeviceObject == NULL) - { - return; - } + if (HandleCount > 1 || FileObject->DeviceObject == NULL) return; -#if 0 -//NOTE: Allmost certain that the latest changes to I/O Mgr makes this redundant (OriginalFileObject case) - ObReferenceObjectByPointer(FileObject, - STANDARD_RIGHTS_REQUIRED, - IoFileObjectType, - UserMode); -#endif - - KeResetEvent( &FileObject->Event ); + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Clear and set up Events */ + KeClearEvent(&FileObject->Event); + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - IO_STATUS_BLOCK Dummy; - /* WRONG WRONG WRONG WRONG!!!!!! */ - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_CLEANUP, - FileObject->DeviceObject, - NULL, - 0, - NULL, - &FileObject->Event, - &Dummy); - /* Hack to fix the above WRONG WRONG WRONG WRONG CODE!!! */ - Irp->UserIosb = &Irp->IoStatus; + /* Allocate an IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + + /* Set it up */ + Irp->UserEvent = &Event; + Irp->UserIosb = &Irp->IoStatus; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API; + + /* Set up Stack Pointer Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_CLEANUP; + StackPtr->FileObject = FileObject; - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->FileObject = FileObject; - - Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, Executive, KernelMode, FALSE, NULL); - } + /* Call the FS Driver */ + Status = IoCallDriver(DeviceObject, Irp); + + /* Wait for completion */ + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } } /* FUNCTIONS *****************************************************************/

19 years, 4 months

[ion] 14920: Fix IopDeleteFile: Use IRP_SYNC_API flag, use local stack event, fix memory leak (Free completion context), dereference completion port, get the right deviceobject if FO_DIRECT_DEVICE_OPEN is set

by ion＠svn.reactos.com

Fix IopDeleteFile: Use IRP_SYNC_API flag, use local stack event, fix memory leak (Free completion context), dereference completion port, get the right deviceobject if FO_DIRECT_DEVICE_OPEN is set Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-01 19:30:06 UTC (rev 14919) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-01 19:36:00 UTC (rev 14920) @@ -177,56 +177,71 @@ STDCALL IopDeleteFile(PVOID ObjectBody) { - PFILE_OBJECT FileObject = (PFILE_OBJECT)ObjectBody; - PIRP Irp; - PIO_STACK_LOCATION StackPtr; - NTSTATUS Status; + PFILE_OBJECT FileObject = (PFILE_OBJECT)ObjectBody; + PIRP Irp; + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + KEVENT Event; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; - DPRINT("IopDeleteFile()\n"); + DPRINT("IopDeleteFile()\n"); - if (FileObject->DeviceObject) - { -#if 0 -//NOTE: Allmost certain that the latest changes to I/O Mgr makes this redundant (OriginalFileObject case) - - ObReferenceObjectByPointer(ObjectBody, - STANDARD_RIGHTS_REQUIRED, - IoFileObjectType, - UserMode); -#endif - KeResetEvent( &FileObject->Event ); - - Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, TRUE); - if (Irp == NULL) - { - /* - * FIXME: This case should eventually be handled. We should wait - * until enough memory is available to allocate the IRP. - */ - ASSERT(FALSE); - } + if (FileObject->DeviceObject) + { + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Clear and set up Events */ + KeClearEvent(&FileObject->Event); + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + + /* Allocate an IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + + /* Set it up */ + Irp->UserEvent = &Event; + Irp->UserIosb = &IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject= FileObject; + Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API; + + /* Set up Stack Pointer Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_CLOSE; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; - Irp->UserEvent = &FileObject->Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->Flags |= IRP_CLOSE_OPERATION; - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_CLOSE; - StackPtr->DeviceObject = FileObject->DeviceObject; - StackPtr->FileObject = FileObject; - - Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, Executive, KernelMode, FALSE, NULL); - } - } - - if (FileObject->FileName.Buffer != NULL) - { - ExFreePool(FileObject->FileName.Buffer); - FileObject->FileName.Buffer = 0; - } + /* Call the FS Driver */ + Status = IoCallDriver(DeviceObject, Irp); + + /* Wait for completion */ + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + /* Clear the file name */ + if (FileObject->FileName.Buffer) + { + ExFreePool(FileObject->FileName.Buffer); + FileObject->FileName.Buffer = NULL; + } + + /* Free the completion context */ + if (FileObject->CompletionContext) + { + ObDereferenceObject(FileObject->CompletionContext->Port); + ExFreePool(FileObject->CompletionContext); + } + } } static

19 years, 4 months

[weiden] 14919: fixed some warnings with gcc4 (mostly assignment differs in signedness warnings)

by weiden＠svn.reactos.com

fixed some warnings with gcc4 (mostly assignment differs in signedness warnings) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/include/drivemap.h Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h Modified: trunk/reactos/boot/freeldr/freeldr/include/miscboot.h Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: trunk/reactos/boot/freeldr/freeldr/include/oslist.h Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h Modified: trunk/reactos/boot/freeldr/freeldr/include/version.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/version.c Modified: trunk/reactos/drivers/bus/serenum/pdo.c Modified: trunk/reactos/hal/halx86/include/mps.h Modified: trunk/reactos/include/ntos/rtltypes.h Modified: trunk/reactos/lib/adns/src/event.c Modified: trunk/reactos/lib/adns/src/general.c Modified: trunk/reactos/lib/adns/src/parse.c Modified: trunk/reactos/lib/adns/src/query.c Modified: trunk/reactos/lib/adns/src/reply.c Modified: trunk/reactos/lib/adns/src/transmit.c Modified: trunk/reactos/lib/adns/src/types.c Modified: trunk/reactos/lib/cards/cards.c Modified: trunk/reactos/lib/kernel32/misc/toolhelp.c Modified: trunk/reactos/lib/rosky/libskygi/libskygi.c Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/dialog.c Modified: trunk/reactos/ntoskrnl/ex/list.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/work.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/gmutex.c Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/rtl/capture.c Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/dhcp/adapter.c Modified: trunk/reactos/subsys/system/dhcp/dhclient.c Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h Modified: trunk/reactos/subsys/win32k/misc/ssec.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/tools/create_nls/create_nls.c Modified: trunk/reactos/tools/mkhive/binhive.c Modified: trunk/reactos/tools/mkhive/infcache.c Modified: trunk/reactos/tools/mkhive/infcache.h Modified: trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/mkhive/registry.c Modified: trunk/reactos/tools/mkhive/registry.h Modified: trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/winebuild/res16.c Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/wrc/dumpres.c Modified: trunk/reactos/tools/wrc/genres.c Modified: trunk/reactos/tools/wrc/readres.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -101,9 +101,9 @@ typedef struct _CM_PNP_BIOS_DEVICE_NODE { USHORT Size; - UCHAR Node; + CHAR Node; ULONG ProductId; - UCHAR DeviceType[3]; + CHAR DeviceType[3]; USHORT DeviceAttributes; } __attribute__((packed)) CM_PNP_BIOS_DEVICE_NODE, *PCM_PNP_BIOS_DEVICE_NODE; @@ -258,7 +258,7 @@ Error = RegSetValue(ComponentKey, "Component Information", REG_BINARY, - (PUCHAR)&CompInfo, + (PCHAR)&CompInfo, sizeof(CM_COMPONENT_INFORMATION)); if (Error != ERROR_SUCCESS) { @@ -287,7 +287,7 @@ LONG Error; InstData = (PCM_PNP_BIOS_INSTALLATION_CHECK)PnpBiosSupported(); - if (InstData == NULL || strncmp(InstData->Signature, "$PnP", 4)) + if (InstData == NULL || strncmp((CHAR*)InstData->Signature, "$PnP", 4)) { DbgPrint((DPRINT_HWDETECT, "PnP-BIOS not supported\n")); return; @@ -335,7 +335,7 @@ Error = RegSetValue(BusKey, "Identifier", REG_SZ, - (PUCHAR)"PNP BIOS", + "PNP BIOS", 9); if (Error != ERROR_SUCCESS) { @@ -413,7 +413,7 @@ Error = RegSetValue(BusKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -495,7 +495,7 @@ Error = RegSetValue(DiskKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -516,7 +516,7 @@ ULONG i; ULONG Checksum; ULONG Signature; - char Identifier[20]; + CHAR Identifier[20]; LONG Error; /* Read the MBR */ @@ -568,7 +568,7 @@ Error = RegSetValue(DiskKey, "Identifier", REG_SZ, - (PUCHAR) Identifier, + Identifier, 20); if (Error != ERROR_SUCCESS) { @@ -673,7 +673,7 @@ Error = RegSetValue(SystemKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -829,7 +829,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -845,7 +845,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + (PCHAR)Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -939,7 +939,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1280,7 +1280,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)&FullResourceDescriptor, + (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) @@ -1294,7 +1294,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -1409,7 +1409,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1426,7 +1426,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1542,7 +1542,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1559,7 +1559,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1702,7 +1702,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)FullResourceDescriptor, + (PCHAR)FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1718,7 +1718,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -1804,7 +1804,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)FullResourceDescriptor, + (PCHAR)FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -1972,7 +1972,7 @@ Error = RegSetValue(ControllerKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)&FullResourceDescriptor, + (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) { @@ -2014,7 +2014,7 @@ Error = RegSetValue(PeripheralKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR)&FullResourceDescriptor, + (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); if (Error != ERROR_SUCCESS) @@ -2029,7 +2029,7 @@ Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, - (PUCHAR)"MICROSOFT PS2 MOUSE", + "MICROSOFT PS2 MOUSE", 20); if (Error != ERROR_SUCCESS) { @@ -2098,7 +2098,7 @@ Error = RegSetValue(ControllerKey, "Identifier", REG_SZ, - (PUCHAR)Buffer, + Buffer, strlen(Buffer) + 1); if (Error != ERROR_SUCCESS) { @@ -2146,7 +2146,7 @@ Error = RegSetValue(BusKey, "Identifier", REG_SZ, - (PUCHAR)"ISA", + "ISA", 4); if (Error != ERROR_SUCCESS) { @@ -2175,7 +2175,7 @@ Error = RegSetValue(BusKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -92,7 +92,7 @@ Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"ACPI BIOS", + "ACPI BIOS", 10); if (Error != ERROR_SUCCESS) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -95,7 +95,7 @@ Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"APM", + "APM", 4); if (Error != ERROR_SUCCESS) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -111,8 +111,8 @@ DetectCPU(FRLDRHKEY CpuKey, FRLDRHKEY FpuKey) { - char VendorIdentifier[13]; - char Identifier[64]; + CHAR VendorIdentifier[13]; + CHAR Identifier[64]; ULONG FeatureSet; FRLDRHKEY CpuInstKey; FRLDRHKEY FpuInstKey; @@ -195,7 +195,7 @@ Error = RegSetValue(CpuInstKey, "FeatureSet", REG_DWORD, - (PUCHAR)&FeatureSet, + (PCHAR)&FeatureSet, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -208,7 +208,7 @@ Error = RegSetValue(CpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -218,7 +218,7 @@ Error = RegSetValue(FpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -231,7 +231,7 @@ Error = RegSetValue(CpuInstKey, "VendorIdentifier", REG_SZ, - (PUCHAR)VendorIdentifier, + VendorIdentifier, strlen(VendorIdentifier) + 1); if (Error != ERROR_SUCCESS) { @@ -250,7 +250,7 @@ Error = RegSetValue(CpuInstKey, "~MHz", REG_DWORD, - (PUCHAR)&CpuSpeed, + (PCHAR)&CpuSpeed, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -339,7 +339,7 @@ Error = RegSetValue(CpuInstKey, "FeatureSet", REG_DWORD, - (PUCHAR)&FeatureSet, + (PCHAR)&FeatureSet, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { @@ -352,7 +352,7 @@ Error = RegSetValue(CpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -362,7 +362,7 @@ Error = RegSetValue(FpuInstKey, "Identifier", REG_SZ, - (PUCHAR)Identifier, + Identifier, strlen(Identifier) + 1); if (Error != ERROR_SUCCESS) { @@ -375,7 +375,7 @@ Error = RegSetValue(CpuInstKey, "VendorIdentifier", REG_SZ, - (PUCHAR)VendorIdentifier, + VendorIdentifier, strlen(VendorIdentifier) + 1); if (Error != ERROR_SUCCESS) { @@ -394,7 +394,7 @@ Error = RegSetValue(CpuInstKey, "~MHz", REG_DWORD, - (PUCHAR)&CpuSpeed, + (PCHAR)&CpuSpeed, sizeof(ULONG)); if (Error != ERROR_SUCCESS) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -178,7 +178,7 @@ Error = RegSetValue(TableKey, "Identifier", REG_SZ, - (PUCHAR)"PCI Real-mode IRQ Routing Table", + "PCI Real-mode IRQ Routing Table", 32); if (Error != ERROR_SUCCESS) { @@ -216,7 +216,7 @@ Error = RegSetValue(TableKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -272,7 +272,7 @@ Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"PCI BIOS", + "PCI BIOS", 9); if (Error != ERROR_SUCCESS) { @@ -301,7 +301,7 @@ Error = RegSetValue(BiosKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PUCHAR) FullResourceDescriptor, + (PCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) _____ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -39,12 +39,12 @@ VOID RunLoader(VOID) { - UCHAR SettingName[80]; - UCHAR SettingValue[80]; + CHAR SettingName[80]; + CHAR SettingValue[80]; ULONG SectionId; ULONG OperatingSystemCount; - PUCHAR *OperatingSystemSectionNames; - PUCHAR *OperatingSystemDisplayNames; + PCHAR *OperatingSystemSectionNames; + PCHAR *OperatingSystemDisplayNames; ULONG DefaultOperatingSystem; LONG TimeOut; ULONG SelectedOperatingSystem; @@ -166,10 +166,10 @@ return; } -ULONG GetDefaultOperatingSystem(PUCHAR OperatingSystemList[], ULONG OperatingSystemCount) +ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount) { - UCHAR DefaultOSText[80]; - char* DefaultOSName; + CHAR DefaultOSText[80]; + PCHAR DefaultOSName; ULONG SectionId; ULONG DefaultOS = 0; ULONG Idx; @@ -205,7 +205,7 @@ LONG GetTimeOut(VOID) { - UCHAR TimeOutText[20]; + CHAR TimeOutText[20]; LONG TimeOut; ULONG SectionId; _____ Modified: trunk/reactos/boot/freeldr/freeldr/custom.c --- trunk/reactos/boot/freeldr/freeldr/custom.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/custom.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -32,20 +32,20 @@ #include <machine.h> -UCHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; -UCHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; -UCHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; -UCHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; -UCHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; -UCHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; -UCHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; -UCHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; +CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; +CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; +CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos"; +CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; +CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; +CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; +CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; +CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; -UCHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; +CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; VOID OptionMenuCustomBoot(VOID) { - PUCHAR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; + PCHAR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; @@ -77,8 +77,8 @@ VOID OptionMenuCustomBootDisk(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second; @@ -119,9 +119,9 @@ VOID OptionMenuCustomBootPartition(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; - UCHAR BootPartitionString[20]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second; @@ -174,10 +174,10 @@ VOID OptionMenuCustomBootBootSectorFile(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; - UCHAR BootPartitionString[20]; - UCHAR BootSectorFileString[200]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; + CHAR BootSectorFileString[200]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second; @@ -242,12 +242,12 @@ VOID OptionMenuCustomBootReactOS(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; - UCHAR BootPartitionString[20]; - UCHAR ReactOSSystemPath[200]; - UCHAR ReactOSARCPath[200]; - UCHAR ReactOSOptions[200]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; + CHAR ReactOSSystemPath[200]; + CHAR ReactOSARCPath[200]; + CHAR ReactOSOptions[200]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second; @@ -315,12 +315,12 @@ VOID OptionMenuCustomBootLinux(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; - UCHAR BootPartitionString[20]; - UCHAR LinuxKernelString[200]; - UCHAR LinuxInitrdString[200]; - UCHAR LinuxCommandLineString[200]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; + CHAR LinuxKernelString[200]; + CHAR LinuxInitrdString[200]; + CHAR LinuxCommandLineString[200]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second; _____ Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -39,9 +39,9 @@ bReportError = bError; } -VOID DiskError(PUCHAR ErrorString, ULONG ErrorCode) +VOID DiskError(PCHAR ErrorString, ULONG ErrorCode) { - UCHAR ErrorCodeString[200]; + CHAR ErrorCodeString[200]; if (bReportError == FALSE) return; @@ -53,7 +53,7 @@ UiMessageBox(ErrorCodeString); } -PUCHAR DiskGetErrorCodeString(ULONG ErrorCode) +PCHAR DiskGetErrorCodeString(ULONG ErrorCode) { switch (ErrorCode) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c --- trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -30,13 +30,13 @@ ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler -VOID DriveMapMapDrivesInSection(PUCHAR SectionName) +VOID DriveMapMapDrivesInSection(PCHAR SectionName) { - UCHAR SettingName[80]; - UCHAR SettingValue[80]; - UCHAR ErrorText[260]; - UCHAR Drive1[80]; - UCHAR Drive2[80]; + CHAR SettingName[80]; + CHAR SettingValue[80]; + CHAR ErrorText[260]; + CHAR Drive1[80]; + CHAR Drive2[80]; ULONG SectionId; ULONG SectionItemCount; ULONG Index; @@ -117,7 +117,7 @@ } } -BOOL DriveMapIsValidDriveString(PUCHAR DriveString) +BOOL DriveMapIsValidDriveString(PCHAR DriveString) { ULONG Index; @@ -147,7 +147,7 @@ return TRUE; } -ULONG DriveMapGetBiosDriveNumber(PUCHAR DeviceName) +ULONG DriveMapGetBiosDriveNumber(PCHAR DeviceName) { ULONG BiosDriveNumber = 0; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -87,12 +87,12 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* Ext2OpenFile(PUCHAR FileName) +FILE* Ext2OpenFile(PCHAR FileName) { EXT2_FILE_INFO TempExt2FileInfo; PEXT2_FILE_INFO FileHandle; - UCHAR SymLinkPath[EXT3_NAME_LEN]; - UCHAR FullPath[EXT3_NAME_LEN * 2]; + CHAR SymLinkPath[EXT3_NAME_LEN]; + CHAR FullPath[EXT3_NAME_LEN * 2]; ULONG Index; DbgPrint((DPRINT_FILESYSTEM, "Ext2OpenFile() FileName = %s\n", FileName)); @@ -190,11 +190,11 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -BOOL Ext2LookupFile(PUCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) +BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) { int i; ULONG NumberOfPathParts; - UCHAR PathPart[261]; + CHAR PathPart[261]; PVOID DirectoryBuffer; ULONG DirectoryInode = EXT3_ROOT_INO; EXT2_INODE InodeData; @@ -289,7 +289,7 @@ return TRUE; } -BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PUCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry) +BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry) { ULONG CurrentOffset; PEXT2_DIR_ENTRY CurrentDirectoryEntry; @@ -839,7 +839,7 @@ BOOL Ext2ReadBlock(ULONG BlockNumber, PVOID Buffer) { - UCHAR ErrorString[80]; + CHAR ErrorString[80]; DbgPrint((DPRINT_FILESYSTEM, "Ext2ReadBlock() BlockNumber = %d Buffer = 0x%x\n", BlockNumber, Buffer)); @@ -913,7 +913,7 @@ ULONG InodeGroupNumber; ULONG InodeBlockNumber; ULONG InodeOffsetInBlock; - UCHAR ErrorString[80]; + CHAR ErrorString[80]; EXT2_GROUP_DESC GroupDescriptor; DbgPrint((DPRINT_FILESYSTEM, "Ext2ReadInode() Inode = %d\n", Inode)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-05-01 19:30:06 UTC (rev 14919) @@ -558,7 +558,7 @@ ULONG inode; /* Inode number */ USHORT rec_len; /* Directory entry length */ USHORT name_len; /* Name length */ - char name[EXT3_NAME_LEN]; /* File name */ + CHAR name[EXT3_NAME_LEN]; /* File name */ }; /* @@ -572,7 +572,7 @@ USHORT rec_len; /* Directory entry length */ UCHAR name_len; /* Name length */ UCHAR file_type; - char name[EXT3_NAME_LEN]; /* File name */ + CHAR name[EXT3_NAME_LEN]; /* File name */ }; /* @@ -667,9 +667,9 @@ BOOL Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector); -FILE* Ext2OpenFile(PUCHAR FileName); -BOOL Ext2LookupFile(PUCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); -BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PUCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); +FILE* Ext2OpenFile(PCHAR FileName); +BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); +BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); ULONGLONG Ext2GetFileSize(FILE *FileHandle); VOID Ext2SetFilePointer(FILE *FileHandle, ULONGLONG NewFilePointer); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -405,22 +405,22 @@ return DirectoryBuffer; } -BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; PDIRENTRY DirEntry; PLFN_DIRENTRY LfnDirEntry; - UCHAR LfnNameBuffer[265]; - UCHAR ShortNameBuffer[20]; + CHAR LfnNameBuffer[265]; + CHAR ShortNameBuffer[20]; ULONG StartCluster; EntryCount = DirectorySize / sizeof(DIRENTRY); DbgPrint((DPRINT_FILESYSTEM, "FatSearchDirectoryBufferForFile() DirectoryBuffer = 0x%x EntryCount = %d FileName = %s\n", DirectoryBuffer, EntryCount, FileName)); - memset(ShortNameBuffer, 0, 13 * sizeof(UCHAR)); - memset(LfnNameBuffer, 0, 261 * sizeof(UCHAR)); + memset(ShortNameBuffer, 0, 13 * sizeof(CHAR)); + memset(LfnNameBuffer, 0, 261 * sizeof(CHAR)); DirEntry = (PDIRENTRY) DirectoryBuffer; for (CurrentEntry=0; CurrentEntry<EntryCount; CurrentEntry++, DirEntry++) @@ -436,7 +436,7 @@ // entries after this one are unused. If this is the // last entry then we didn't find the file in this directory. // - if (DirEntry->FileName[0] == 0x00) + if (DirEntry->FileName[0] == '\0') { return FALSE; } @@ -444,10 +444,10 @@ // // Check if this is a deleted entry or not // - if (DirEntry->FileName[0] == 0xE5) + if (DirEntry->FileName[0] == '\xE5') { - memset(ShortNameBuffer, 0, 13 * sizeof(UCHAR)); - memset(LfnNameBuffer, 0, 261 * sizeof(UCHAR)); + memset(ShortNameBuffer, 0, 13 * sizeof(CHAR)); + memset(LfnNameBuffer, 0, 261 * sizeof(CHAR)); continue; } @@ -616,7 +616,7 @@ return FALSE; } -BOOL FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOL FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; @@ -687,11 +687,11 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -BOOL FatLookupFile(PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { int i; ULONG NumberOfPathParts; - UCHAR PathPart[261]; + CHAR PathPart[261]; PVOID DirectoryBuffer; ULONG DirectoryStartCluster = 0; ULONG DirectorySize; @@ -777,7 +777,7 @@ * is in the form of "FILE EXT" and puts it in Buffer * in the form of "file.ext" */ -void FatParseShortFileName(PUCHAR Buffer, PDIRENTRY DirEntry) +void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry) { ULONG Idx; @@ -915,7 +915,7 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* FatOpenFile(PUCHAR FileName) +FILE* FatOpenFile(PCHAR FileName) { FAT_FILE_INFO TempFatFileInfo; PFAT_FILE_INFO FileHandle; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h --- trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-05-01 19:30:06 UTC (rev 14919) @@ -23,7 +23,7 @@ typedef struct _FAT_BOOTSECTOR { UCHAR JumpBoot[3]; // Jump instruction to boot code - UCHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes + CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes USHORT BytesPerSector; // Bytes per sector UCHAR SectorsPerCluster; // Number of sectors in a cluster USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) @@ -40,8 +40,8 @@ UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. ULONG VolumeSerialNumber; // Volume serial number - UCHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory - UCHAR FileSystemType[8]; // One of the strings "FAT12 ", "FAT16 ", or "FAT " + CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory + CHAR FileSystemType[8]; // One of the strings "FAT12 ", "FAT16 ", or "FAT " UCHAR BootCodeAndData[448]; // The remainder of the boot sector @@ -52,7 +52,7 @@ typedef struct _FAT32_BOOTSECTOR { UCHAR JumpBoot[3]; // Jump instruction to boot code - UCHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes + CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes USHORT BytesPerSector; // Bytes per sector UCHAR SectorsPerCluster; // Number of sectors in a cluster USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) @@ -76,8 +76,8 @@ UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. ULONG VolumeSerialNumber; // Volume serial number - UCHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory - UCHAR FileSystemType[8]; // Always set to the string "FAT32 " + CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory + CHAR FileSystemType[8]; // Always set to the string "FAT32 " UCHAR BootCodeAndData[420]; // The remainder of the boot sector @@ -87,7 +87,7 @@ typedef struct _FATX_BOOTSECTOR { - UCHAR FileSystemType[4]; /* String "FATX" */ + CHAR FileSystemType[4]; /* String "FATX" */ ULONG VolumeSerialNumber; /* Volume serial number */ ULONG SectorsPerCluster; /* Number of sectors in a cluster */ USHORT NumberOfFats; /* Number of FAT tables */ @@ -101,7 +101,7 @@ */ typedef struct //_DIRENTRY { - UCHAR FileName[11]; /* Filename + extension */ + CHAR FileName[11]; /* Filename + extension */ UCHAR Attr; /* File attributes */ UCHAR ReservedNT; /* Reserved for use by Windows NT */ UCHAR TimeInTenths; /* Millisecond stamp at file creation */ @@ -131,7 +131,7 @@ { UCHAR FileNameSize; /* Size of filename (max 42) */ UCHAR Attr; /* File attributes */ - UCHAR FileName[42]; /* Filename in ASCII, padded with 0xff (not zero-terminated) */ + CHAR FileName[42]; /* Filename in ASCII, padded with 0xff (not zero-terminated) */ ULONG StartCluster; /* Starting cluster number */ ULONG Size; /* File size */ USHORT Time; /* Time last modified */ @@ -155,11 +155,11 @@ BOOL FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG PartitionSectorCount); ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount); PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOL RootDirectory); -BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -BOOL FatLookupFile(PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -void FatParseShortFileName(PUCHAR Buffer, PDIRENTRY DirEntry); +BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); +BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); +void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry); BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer); -FILE* FatOpenFile(PUCHAR FileName); +FILE* FatOpenFile(PCHAR FileName); ULONG FatCountClustersInChain(ULONG StartCluster); ULONG* FatGetClusterChainArray(ULONG StartCluster); BOOL FatReadCluster(ULONG ClusterNumber, PVOID Buffer); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -42,7 +42,7 @@ // FUNCTIONS //////////////////////////////////////////////////////////////////////// ///////////////////// -VOID FileSystemError(PUCHAR ErrorString) +VOID FileSystemError(PCHAR ErrorString) { DbgPrint((DPRINT_FILESYSTEM, "%s\n", ErrorString)); @@ -59,7 +59,7 @@ */ static BOOL FsOpenVolume(ULONG DriveNumber, ULONGLONG StartSector, ULONGLONG SectorCount, int Type) { - UCHAR ErrorText[80]; + CHAR ErrorText[80]; FsType = Type; @@ -123,7 +123,7 @@ } -PFILE FsOpenFile(PUCHAR FileName) +PFILE FsOpenFile(PCHAR FileName) { PFILE FileHandle = NULL; @@ -337,7 +337,7 @@ * This function parses a path in the form of dir1\dir2\file1.ext * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext) */ -ULONG FsGetNumPathParts(PUCHAR Path) +ULONG FsGetNumPathParts(PCHAR Path) { ULONG i; ULONG num; @@ -362,7 +362,7 @@ * and puts the first name of the path (e.g. "dir1") in buffer * compatible with the MSDOS directory structure */ -VOID FsGetFirstNameFromPath(PUCHAR Buffer, PUCHAR Path) +VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path) { ULONG i; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -65,12 +65,12 @@ } -static BOOL IsoSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectoryLength, PUCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) +static BOOL IsoSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectoryLength, PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) { PDIR_RECORD Record; ULONG Offset; ULONG i; - UCHAR Name[32]; + CHAR Name[32]; DbgPrint((DPRINT_FILESYSTEM, "IsoSearchDirectoryBufferForFile() DirectoryBuffer = 0x%x DirectoryLength = %d FileName = %s\n", DirectoryBuffer, DirectoryLength, FileName)); @@ -180,11 +180,11 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -static BOOL IsoLookupFile(PUCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) +static BOOL IsoLookupFile(PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) { int i; ULONG NumberOfPathParts; [truncated at 1000 lines; 2895 more skipped]

19 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005