Ros-diffs

ros-diffs@reactos.org

81390 discussions

[royce] 19706: add simplified version of XMLLoadFile() - preparation to move up a directory
by royce＠svn.reactos.com 27 Nov '05

27 Nov '05

add simplified version of XMLLoadFile() - preparation to move up a directory Modified: trunk/reactos/tools/rbuild/xml.cpp Modified: trunk/reactos/tools/rbuild/xml.h _____ Modified: trunk/reactos/tools/rbuild/xml.cpp --- trunk/reactos/tools/rbuild/xml.cpp 2005-11-27 22:59:20 UTC (rev 19705) +++ trunk/reactos/tools/rbuild/xml.cpp 2005-11-27 23:01:38 UTC (rev 19706) @@ -849,9 +849,10 @@ } XMLElement* -XMLLoadFile ( const string& filename, - const Path& path, - XMLIncludes& includes ) +XMLLoadFile ( + const string& filename, + const Path& path, + XMLIncludes& includes ) { XMLFile* f = new XMLFile(); @@ -909,3 +910,11 @@ } return head; } + +XMLElement* +XMLLoadFile ( const string& filename ) +{ + Path path; + XMLIncludes includes; + return XMLLoadFile ( filename, path, includes ); +} _____ Modified: trunk/reactos/tools/rbuild/xml.h --- trunk/reactos/tools/rbuild/xml.h 2005-11-27 22:59:20 UTC (rev 19705) +++ trunk/reactos/tools/rbuild/xml.h 2005-11-27 23:01:38 UTC (rev 19706) @@ -233,4 +233,7 @@ const Path& path, XMLIncludes& includes ); +XMLElement* +XMLLoadFile ( const std::string& filename ); + #endif // XML_H

1 0

[royce] 19705: remove dependance on rbuild's headers - preparation to move up a directory
by royce＠svn.reactos.com 27 Nov '05

27 Nov '05

remove dependance on rbuild's headers - preparation to move up a directory Modified: trunk/reactos/tools/rbuild/ssprintf.cpp _____ Modified: trunk/reactos/tools/rbuild/ssprintf.cpp --- trunk/reactos/tools/rbuild/ssprintf.cpp 2005-11-27 22:45:01 UTC (rev 19704) +++ trunk/reactos/tools/rbuild/ssprintf.cpp 2005-11-27 22:59:20 UTC (rev 19705) @@ -13,7 +13,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "pch.h" #ifdef __FreeBSD__ # include <stdlib.h> @@ -305,7 +304,7 @@ double* __n; ieee_double_t* n; } n; - + n.__n = &__n; if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { @@ -496,7 +495,7 @@ double* __n; ieee_double_t* n; } n; - + n.__n = &__n; if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) { @@ -708,7 +707,7 @@ if ( exp_sign == 'g' || exp_sign == 'G' ) { type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) + if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E else exp_sign = 'f'; @@ -739,7 +738,7 @@ if ( exp_sign == 'f' ) { - + buf = (char*)alloca(4096); if (type & LEFT) { @@ -912,7 +911,7 @@ if ( exp_sign == L'g' || exp_sign == L'G' ) { type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) + if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E else exp_sign = 'f'; @@ -943,7 +942,7 @@ if ( exp_sign == L'f' ) { - + buf = (wchar_t*)alloca(4096*sizeof(wchar_t)); if (type & LEFT) { @@ -1486,7 +1485,7 @@ case 'G': if (qualifier == 'l' || qualifier == 'L' ) { _ldouble = va_arg(args, long double); - + if ( _isnanl(_ldouble) ) { f += "Nan"; @@ -1810,7 +1809,7 @@ if (qualifier == L'l' || qualifier == L'L' ) { _ldouble = va_arg(args, long double); - + if ( _isnanl(_ldouble) ) { f += L"Nan";

1 0

[weiden] 19704: fixed uninitialized variable warning
by weiden＠svn.reactos.com 27 Nov '05

27 Nov '05

fixed uninitialized variable warning Modified: trunk/reactos/lib/syssetup/wizard.c _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-11-27 22:33:18 UTC (rev 19703) +++ trunk/reactos/lib/syssetup/wizard.c 2005-11-27 22:45:01 UTC (rev 19704) @@ -1570,7 +1570,7 @@ case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; - ULONG MaxProgress; + ULONG MaxProgress = 0; switch (lpnm->code) {

1 0

[weiden] 19703: Patch by encoded <samcharly@hotmail.com>:
by weiden＠svn.reactos.com 27 Nov '05

27 Nov '05

Patch by encoded <samcharly(a)hotmail.com>: - added some Spanish translations Added: trunk/reactos/lib/cpl/appwiz/Es.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Added: trunk/reactos/lib/cpl/control/Es.rc Modified: trunk/reactos/lib/cpl/control/control.rc Added: trunk/reactos/lib/cpl/intl/Es.rc Modified: trunk/reactos/lib/cpl/intl/intl.rc Added: trunk/reactos/lib/cpl/ncpa/Es.rc Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc Added: trunk/reactos/lib/cpl/sysdm/es.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc Added: trunk/reactos/lib/shellext/slayer/Es.rc Modified: trunk/reactos/lib/shellext/slayer/slayer.rc Modified: trunk/reactos/lib/syssetup/syssetup.rc Added: trunk/reactos/lib/syssetup/syssetup_Es.rc Added: trunk/reactos/lib/userenv/Es.rc Modified: trunk/reactos/lib/userenv/userenv.rc _____ Added: trunk/reactos/lib/cpl/appwiz/Es.rc --- trunk/reactos/lib/cpl/appwiz/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/appwiz/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,56 @@ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalar/Desinstalar" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "Para instalar un programa, presione instalar",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Instalar...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "El siguiente software puede ser removido automaticamente. Para remover un programa o modificar sus componentes instalados, seleccionalo en la lista y pulsa A±adir/Remover.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "A±adir/&Remover", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Configuraci¾n de ReactOs" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crear enlace" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crear enlace" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "A±adir/Remover Programas" + IDS_CPLSYSTEMDESCRIPTION "Instala o Remueve programas." +END Property changes on: trunk/reactos/lib/cpl/appwiz/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -31,3 +31,5 @@ #include "Nl.rc" #include "Ru.rc" #include "Pl.rc" +#include "Es.rc" + _____ Added: trunk/reactos/lib/cpl/control/Es.rc --- trunk/reactos/lib/cpl/control/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/control/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,32 @@ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Cerrar", IDM_CLOSE + END + POPUP "&View" + BEGIN + MENUITEM "Iconos Grandes", IDM_LARGEICONS + MENUITEM "Iconos Peque±os", IDM_SMALLICONS + MENUITEM "Lista", IDM_LIST + MENUITEM "Detalles", IDM_DETAILS + END + POPUP "Ayuda" + BEGIN + MENUITEM "Sobre", IDM_ABOUT + END +END + Property changes on: trunk/reactos/lib/cpl/control/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/control/control.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -41,4 +41,6 @@ #include "Pl.rc" #include "Ru.rc" #include "Sv.rc" +#include "Es.rc" #include "Hu.rc" + _____ Added: trunk/reactos/lib/cpl/intl/Es.rc --- trunk/reactos/lib/cpl/intl/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/intl/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,88 @@ +/* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 1",-1,73,74,90,8 +END + + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Numeros" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 2",-1,73,74,90,8 +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Moneda" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 3",-1,73,74,90,8 +END + + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tiempo" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ejemplo de Apariencia", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Ejemplo de tiempo:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Formato de Tiempo:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&Separador de Tiempo:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "SÝmbolo A&M:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "SÝmbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + LTEXT "Formato de Notaci¾n del Tiempo\n\n" + "h = hora m = minuto s = segundo t = am ¾ pm\n\n" + "h = 12 houras\n" + "H = 24 houras\n\n" + "hh, mm, ss = cero inicial\n" + "h, m, s = sin cero inicial", + -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +END + + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Dia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 5",-1,73,74,90,8 +END + + +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Localidad" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Seleccione el lenguaje primario y la regi¾n que desea usar:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Opciones Regionales" + IDS_CPLDESCRIPTION "Seleccione lenguaje y formato numerio, moneda, hora y fecha." +END Property changes on: trunk/reactos/lib/cpl/intl/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/intl/intl.rc --- trunk/reactos/lib/cpl/intl/intl.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/intl/intl.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -26,5 +26,7 @@ #include "de.rc" #include "nl.rc" #include "sv.rc" +#include "es.rc" #include "Ja.rc" #include "hu.rc" + _____ Added: trunk/reactos/lib/cpl/ncpa/Es.rc --- trunk/reactos/lib/cpl/ncpa/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/ncpa/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,93 @@ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades de la Red" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Adaptadores de la red",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&A±adir",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Remover",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Propiedades",IDC_PROPERTIES,179,100,60,14 +END + +IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Connectarse Usando:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Configurar", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Los componentes marcados son utilizados por esta conecci¾n:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + PUSHBUTTON "&Instalar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Descripci¾n", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "La Descripci¾n del componente va aqui...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Ense±ar icono de estatus cuando conectado", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Coneci¾n", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Estatus:", -1, 19, 20, 60, 8 + LTEXT "Duraci¾n:", -1, 19, 34, 60, 8 + LTEXT "Velocidad:", -1, 19, 48, 60, 8 + GROUPBOX "Actividad", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Enviado", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Recibido", -1, 149, 90, 37, 8 + LTEXT "Paquetes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Desabilitar", IDC_ENDISABLE, 66, 150, 50, 14 +END + +IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Se pueden asignar las propiedades de IP automaticamente si su red apoya esta capacidad. Si no, debe contactar su administrador de red para los ajustes necesarios.", -1, 9, 9, 228, 27 + CONTROL "Obtener direcci¾n IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "&Usar la siguiente Direcci¾n IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "Direcci¾n IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 + LTEXT "Subnet mask:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 + LTEXT "Default gateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 + CONTROL "Obtener direcci¾n del servidor DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "&Usar las siguiente direcciones de DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "Servidor DNS Preferido:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 + LTEXT "Servidor DNS Alterno:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 + PUSHBUTTON "&Avanzado", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +} + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Propiedades de la Red" + IDS_CPLSYSTEMDESCRIPTION "Cambia las opciones de la red." +END Property changes on: trunk/reactos/lib/cpl/ncpa/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc --- trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -24,5 +24,7 @@ #include "dk.rc" #include "nl.rc" #include "sv.rc" +#include "es.rc" #include "Ja.rc" #include "hu.rc" + _____ Added: trunk/reactos/lib/cpl/sysdm/es.rc --- trunk/reactos/lib/cpl/sysdm/es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/sysdm/es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,143 @@ +// Spanish language resource file +// React Operating System 2005 +// Samuel Serapi¾n Vega + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +RC_LICENSE RTDATA "resources/gpl.txt" + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Sistema Operativo",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PR OPSHEETPADDING,8 + LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3), PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Versi¾n " REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE( 4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + LTEXT "Computadora",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN -PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(7) ,PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(8),PROPSHEETWI DTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(9),PROPSH EETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(10),PROPSHE ETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING,LABELLINE(13),PROPSHEETWIDTH-(2*PROPSHE ETPADDING),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING,ES_LEFT|WS_TAB STOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY +END + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Identificaci¾n en el Red" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "ReactOs utiliza la siguiente informaci¾n para identificar tu computadora en la red.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-(6* PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Nombre Completo del computador:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LABE LLINE(4)-4 + LTEXT "(predeterminado)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,6 0,LABELLINE(4)-5 + LTEXT "Grupo de Trabajo:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROPSHE ETPADDING,LABELLINE(6)-6 + LTEXT "(vacio)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING,LABELLINE(6)-6,60 ,LABELLINE(6)-6 + LTEXT "Para usar el asistente de identificaci¾n del red unirse a un dominio o crear un usuario local, pulse Identificaci¾n de Red.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPAD DING)-ICONSIZE,LABELLINE(8)+5 + PUSHBUTTON "&Network ID...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 + LTEXT "Para renombrar la computadora o unirse a un dominio, pulse Propiedades.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PRO PSHEETPADDING)-ICONSIZE,LABELLINE(12)+2 + PUSHBUTTON "&Propiedades...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE( 1)+4 +END + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Asistente de Hardware",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "El asistente de hardware the ayuda instalar, desinstalar, reparar, desconectar, expulsar, y configurar tu hardware.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + PUSHBUTTON "&Asistente de Hardware...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LA BELLINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Administrador de Dispositivos",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPS HEETPADDING),LABELLINE(7)+2 + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON + LTEXT "The Device Manager lists all the hardware devices installed on your computer. Use the Device Manager to change the properties of any device.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "&Administrador de Dispositivos...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEE TPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Perfiles de Hardware",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Los perfiles de hardware proveen una forma para que usted archive diferentes configuraciones de hardware.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Perfiles Hard&ware ...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE (20)+2,(15*PROPSHEETPADDING),14 +END + +IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Perfiles de Usuarios" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Los perfiles de usuarios archivan el escritorio y otra informaci¾n relacionada a tu login. Un perfil diferente puede ser creado en cada computadora que utilize, o puede seleccionar un perfil movil que es igual en cada computadora que utilize.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4) + LTEXT "Perfiles archivados en esta computadora:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(1) + CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHO WSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABEL LINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTED GE + + PUSHBUTTON "Borrar",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELL INE(1)+2 + PUSHBUTTON "Cambiar tipo...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,L ABELLINE(1)+2 + PUSHBUTTON "Copiar a...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING-60,LABELLINE( 20),60,LABELLINE(1)+2 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Avanzado" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Funcionamiento",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Las opciones de funcionamiento controlan como los programas utilizan la memoria, lo cual afecta la velocidad de su computadora.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Opciones de &funcionamiento...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABE LLINE(5)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "Variables de entorno",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEETP ADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Las Variables de entorno le dicen a su computadora donde encontrar ciertos typo de informaci¾n.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Variables de &entorno...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(1 2)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "&Arranque y recuperaci¾n",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Las opciones de Arranque y recuperaci¾n le dicen a su computadora como empezar y que hacer si un error cause que su computadora se detenga.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Arranque y recuperaci¾n...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLI NE(19)+2,(18*PROPSHEETPADDING),14 +END + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Environment Variables" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Variables de Usuario",-1,7,12,238,100 + LTEXT "&Variables:",-1,14,24,224,8 + CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_S HOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS _TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "&Nuevas...",IDC_USER_VARIABLE_NEW,80,90,50,14 + PUSHBUTTON "&Editar...",IDC_USER_VARIABLE_EDIT,134,90,50,14 + PUSHBUTTON "&Borrar",IDC_USER_VARIABLE_DELETE,188,90,50,14 + + GROUPBOX "Variables del Systema",-1,7,116,238,100 + LTEXT "V&ariables:",-1,14,128,224,8 + CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS _SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL| WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "Nu&evas...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 + PUSHBUTTON "Ed&itar...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 + PUSHBUTTON "Bo&rrar",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 + + DEFPUSHBUTTON "Aceptar",IDOK,141,224,50,14,WS_GROUP + PUSHBUTTON "Cancelar",IDCANCEL,195,224,50,14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Editar Variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nombre de Variable:",-1,7,14,50,8 + EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL + LTEXT "Valor Variable:",-1,7,32,50,8 + EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL + + DEFPUSHBUTTON "Aceptar",IDOK,116,50,50,14,WS_GROUP + PUSHBUTTON "Cancelar",IDCANCEL,170,50,50,14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Systema" + IDS_CPLSYSTEMDESCRIPTION "Ver informaci¾n de su Computadora y cambiar varias opciones del systema." +END Property changes on: trunk/reactos/lib/cpl/sysdm/es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc --- trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -22,5 +22,7 @@ #include "fr.rc" #include "nl.rc" #include "sv.rc" +#include "es.rc" #include "Ja.rc" #include "hu.rc" + _____ Added: trunk/reactos/lib/shellext/slayer/Es.rc --- trunk/reactos/lib/shellext/slayer/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/shellext/slayer/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,43 @@ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Compatibilidad" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Si tiene problemas corriendo este programa en ReactOS, selecione un sistema operativo el cual ReactOS le reportara a la applicaci¾n.", -1, 7,7,210,31 + GROUPBOX "Modo de Compatibilidad", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "Corre este programa en mode de compatibilidad para:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Ajuste de Pantalla", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Usar 256 colores", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Usar resoluci¾n 640x480", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Disabilitar temas visuales", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "E&ditar modos de compatibilidad...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Editar Modos de Compatibilidad" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&A±adir...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&Editar...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "&Borrar", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&Aceptar", IDOK, 95,116,60,14 + PUSHBUTTON "&Cancelar", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Capa de extenci¾n de compatibilidad para applicaciones" +END + Property changes on: trunk/reactos/lib/shellext/slayer/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shellext/slayer/slayer.rc --- trunk/reactos/lib/shellext/slayer/slayer.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/shellext/slayer/slayer.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -20,4 +20,6 @@ #include "Nl.rc" #include "Pl.rc" #include "Sv.rc" +#include "Es.rc" #include "Hu.rc" + _____ Modified: trunk/reactos/lib/syssetup/syssetup.rc --- trunk/reactos/lib/syssetup/syssetup.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/syssetup/syssetup.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -47,4 +47,6 @@ #include "syssetup_Fr.rc" #include "syssetup_Nl.rc" #include "syssetup_Ja.rc" +#include "syssetup_Es.rc" #include "syssetup_Hu.rc" + _____ Added: trunk/reactos/lib/syssetup/syssetup_Es.rc --- trunk/reactos/lib/syssetup/syssetup_Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/syssetup/syssetup_Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,203 @@ +/* + * Copyright (C) 2004 Filip Navara + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bienvenido al asistente de instalaci¾n the ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Este asistente instala ReactOS en tu computadora. El asistente "\ + "necesita recoger alguna informaci¾n sobre usted y su computadora "\ + "para configurar ReactOS apropiadamente.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Pulse Pr¾ximo para continuar la instalaci¾n.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS developers would like to acknowledge the following Open Source projects, "\ + "(parts of) which were used to create ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS is licensed under the GPL, so if you want to reuse or redistribute "\ + "(parts of) it you must respect the GPL", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&View GPL...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Click Next to continue with Setup.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Escriba su nombre completo y el nombre de su Compa±ia u organizaci¾n.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "No&mbre:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organizaci¾n:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Escriba un nombre para su computadora que sea de 63 characteres o menos. "\ + "Si se encuentra conectado a una red, el nombre debe ser unico.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "Nombre de la &Computadora:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "El instalador creara un perfil en su computadora llamado Administrator. "\ + "Puede utilizar este perfil si necesita acceso completo a su computadora.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Escriba una contrase±a para este perfil de 14 characteres o menos.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "Contrase±a &Administrator:", IDC_STATIC, 54, 104, 75, 8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfirme contrase±a:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "La localidad del sistema de ser compatible con la de las aplicaciones "\ + "que usted desea usar. La localidad del usuario controla como se representan los numeros, "\ + "monedas, y fechas que aparecen en el sistema.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Para cambiar la localidad del sistema o de los usuarios, pulse Modificar.", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "La disposici¾n de teclado controla los characteres que aparesen cuando usted escribe.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Para cambiar la disposici¾n de teclad, pulse Modificar.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "&Modificar...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Fecha y Tiempo", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Zona de tiempo", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Ajustar el reloj automaticamente en temporada de &ahorro de la luz del dÝa", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Some text...", IDC_STATIC, 53, 7, 253, 20 + LTEXT "Some more text...", IDC_STATIC, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizaci¾n de la Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Terminando el asistente de Instalaci¾n de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Usted a terminado con Úxito la instalaci¾n de ReactOS.\n\n" \ + "Cuando Pulse Terminar, su computadora sera recargada.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Si hay un DC en su lector, remuevalo. Luego, recarge su computadora "\ + "pulse Terminar.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_RESTART DIALOG 6, 18, 245, 116 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Usted a terminado con Úxito la instalaci¾n de ReactOS.", IDC_STATIC, 13, 12, 212, 16 + LTEXT "Para poder proseguir, el programa de instalaci¾n necesita recargar su computadora. "\ + "La computadora sera recargada automaticamente en 15 segundos o si presiona el "\ + "boton de recargar.", IDC_STATIC, 13, 33, 212, 32 +/* GROUPBOX "", -1, 7, 3, 231, 106 */ + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 13, 70, 212, 8 + PUSHBUTTON "&Recargar", IDOK, 98, 87, 50, 14 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Acknowledgements" + IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information" + IDS_OWNERTITLE "Personalize your Software" + IDS_OWNERSUBTITLE "Setup uses this information about yourself to personalize ReactOS." + IDS_COMPUTERTITLE "Computer Name and Administrator Password" + IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." + IDS_LOCALETITLE "Regional settings" + IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_DATETIMETITLE "Date and Time" + IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." + IDS_PROCESSTITLE "Process page title" + IDS_PROCESSSUBTITLE "Process page subtitle" +END + +/* EOF */ Property changes on: trunk/reactos/lib/syssetup/syssetup_Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/userenv/Es.rc --- trunk/reactos/lib/userenv/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/userenv/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Opciones y Documentos" + IDS_APPDATA "Data de Aplicaci¾n" + IDS_DESKTOP "Escritorio" + IDS_FAVORITES "Favoritos" + IDS_STARTMENU "Menu de Inicio" + IDS_PROGRAMS "Menu de Inicio\\Programas" + IDS_ADMINTOOLS "Menu de Inicio\\Programas\\Herramientas Administrativas" + IDS_STARTUP "Menu de Inicio\\Programas\\Autoinicio" + IDS_MYDOCUMENTS "Mis Documentos" + IDS_MYPICTURES "Mis Documentos\\Mis Fotos" + IDS_MYMUSIC "Mis Documentos\\Mi M·sica" + IDS_MYVIDEOS "Mis Documentos\\Mis Videos" + IDS_TEMPLATES "Plantillas" + IDS_RECENT "Reciente" + IDS_SENDTO "Enviar a" + IDS_PRINTHOOD "Vecindario Inmpresi¾n" + IDS_NETHOOD "Vecindario Red" + IDS_LOCALSETTINGS "Opciones Locales" + IDS_LOCALAPPDATA "Opciones Locales\\Data de Aplicaci¾n" + IDS_TEMP "Opciones Locales\\Temp" + IDS_CACHE "Opciones Locales\\Archivos de Internet Temporales" + IDS_HISTORY "Opciones Locales\\Historia" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Archivos de Programas" +END Property changes on: trunk/reactos/lib/userenv/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/userenv/userenv.rc --- trunk/reactos/lib/userenv/userenv.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/userenv/userenv.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -45,3 +45,5 @@ #include "Pl.rc" #include "Sv.rc" #include "Ru.rc" +#include "Es.rc" +

1 0

[gvg] 19702: Auto-register DLLs during 2nd stage setup
by gvg＠svn.reactos.com 27 Nov '05

27 Nov '05

Auto-register DLLs during 2nd stage setup Modified: trunk/reactos/lib/avifil32/avifil32.xml Modified: trunk/reactos/lib/comctl32/comctl32.xml Modified: trunk/reactos/lib/dinput/dinput.xml Modified: trunk/reactos/lib/dinput8/dinput8.xml Modified: trunk/reactos/lib/dplayx/dplayx.xml Modified: trunk/reactos/lib/dsound/dsound.xml Modified: trunk/reactos/lib/dxdiagn/dxdiagn.xml Modified: trunk/reactos/lib/msi/msi.xml Modified: trunk/reactos/lib/objsel/objsel.xml Modified: trunk/reactos/lib/ole32/ole32.xml Modified: trunk/reactos/lib/oleaut32/oleaut32.xml Modified: trunk/reactos/lib/olepro32/olepro32.xml Modified: trunk/reactos/lib/rpcrt4/rpcrt4.xml Modified: trunk/reactos/lib/shell32/regsvr.c Modified: trunk/reactos/lib/shell32/shell32.xml Modified: trunk/reactos/lib/syssetup/resource.h Modified: trunk/reactos/lib/syssetup/syssetup.xml Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc Modified: trunk/reactos/lib/syssetup/syssetup_De.rc Modified: trunk/reactos/lib/syssetup/syssetup_En.rc Modified: trunk/reactos/lib/syssetup/syssetup_Fr.rc Modified: trunk/reactos/lib/syssetup/syssetup_Hu.rc Modified: trunk/reactos/lib/syssetup/syssetup_Ja.rc Modified: trunk/reactos/lib/syssetup/syssetup_Nl.rc Modified: trunk/reactos/lib/syssetup/wizard.c Modified: trunk/reactos/lib/wininet/wininet.xml Modified: trunk/reactos/media/inf/syssetup.inf.tpl _____ Modified: trunk/reactos/lib/avifil32/avifil32.xml --- trunk/reactos/lib/avifil32/avifil32.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/avifil32/avifil32.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="avifil32.spec.def" /> <include base="avifil32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/comctl32/comctl32.xml --- trunk/reactos/lib/comctl32/comctl32.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/comctl32/comctl32.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/dinput/dinput.xml --- trunk/reactos/lib/dinput/dinput.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/dinput/dinput.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dinput.spec.def" /> <include base="dinput">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/dinput8/dinput8.xml --- trunk/reactos/lib/dinput8/dinput8.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/dinput8/dinput8.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="dinput8" type="win32dll" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dinput8.spec.def" /> <include base="dinput8">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/dplayx/dplayx.xml --- trunk/reactos/lib/dplayx/dplayx.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/dplayx/dplayx.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true"> +  <importlibrary definition="dplayx.spec.def" /> <include base="dplayx">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/dsound/dsound.xml --- trunk/reactos/lib/dsound/dsound.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/dsound/dsound.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}" installbase="system32" installname="dsound.dll" allowwarnings ="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dsound.spec.def" /> <include base="dsound">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/dxdiagn/dxdiagn.xml --- trunk/reactos/lib/dxdiagn/dxdiagn.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/dxdiagn/dxdiagn.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dxdiagn.spec.def" /> <include base="dxdiagn">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/msi/msi.xml --- trunk/reactos/lib/msi/msi.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/msi/msi.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="msi.spec.def" /> <include base="msi">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/objsel/objsel.xml --- trunk/reactos/lib/objsel/objsel.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/objsel/objsel.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="objsel" type="win32dll" baseaddress="${BASEADDRESS_OBJSEL}" installbase="system32" installname="objsel.dll"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="objsel.spec.def" /> <include base="objsel">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/ole32/ole32.xml --- trunk/reactos/lib/ole32/ole32.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/ole32/ole32.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ole32.spec.def" /> <include base="ole32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/oleaut32/oleaut32.xml --- trunk/reactos/lib/oleaut32/oleaut32.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/oleaut32/oleaut32.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="oleaut32.spec.def" /> <include base="oleaut32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/olepro32/olepro32.xml --- trunk/reactos/lib/olepro32/olepro32.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/olepro32/olepro32.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="olepro32.spec.def" /> <include base="olepro32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.xml --- trunk/reactos/lib/rpcrt4/rpcrt4.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/rpcrt4/rpcrt4.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="rpcrt4.spec.def" /> <include base="rpcrt4">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/shell32/regsvr.c --- trunk/reactos/lib/shell32/regsvr.c 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/shell32/regsvr.c 2005-11-27 22:27:35 UTC (rev 19702) @@ -642,11 +642,13 @@ static const WCHAR wszMyDocuments[] = { 'M','y',' ','D','o','c','u','m','e','n','t','s', 0 }; static struct regsvr_namespace const namespace_extensions_list[] = { +#if 0 { &CLSID_MyDocuments, wszDesktop, wszMyDocuments }, +#endif { NULL } }; _____ Modified: trunk/reactos/lib/shell32/shell32.xml --- trunk/reactos/lib/shell32/shell32.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/shell32/shell32.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="shell32.spec.def" /> <include base="shell32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/syssetup/resource.h --- trunk/reactos/lib/syssetup/resource.h 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/resource.h 2005-11-27 22:27:35 UTC (rev 19702) @@ -53,7 +53,9 @@ #define IDC_AUTODAYLIGHT 1054 #define IDD_PROCESSPAGE 1060 -#define IDC_PROCESSPROGRESS 1061 +#define IDC_ACTIVITY 1061 +#define IDC_ITEM 1062 +#define IDC_PROCESSPROGRESS 1063 #define IDD_FINISHPAGE 1070 #define IDC_FINISHTITLE 1071 @@ -94,6 +96,16 @@ #define IDS_CMT_SOLITAIRE 3216 #define IDS_CMT_WINEMINE 3217 +#define IDS_REACTOS_SETUP 3300 +#define IDS_UNKNOWN_ERROR 3301 +#define IDS_REGISTERING_COMPONENTS 3302 +#define IDS_LOADLIBRARY_FAILED 3303 +#define IDS_GETPROCADDR_FAILED 3304 +#define IDS_REGSVR_FAILED 3305 +#define IDS_DLLINSTALL_FAILED 3306 +#define IDS_TIMEOUT 3307 +#define IDS_REASON_UNKNOWN 3308 + #define IDR_GPL 4000 #endif /* RESOURCE_H */ _____ Modified: trunk/reactos/lib/syssetup/syssetup.xml --- trunk/reactos/lib/syssetup/syssetup.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/syssetup.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -6,6 +6,7 @@ <define name="_UNICODE" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> + <define name="_SETUPAPI_VER">0x0501</define> <library>uuid</library> <library>ntdll</library> <library>kernel32</library> _____ Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc --- trunk/reactos/lib/syssetup/syssetup_Cz.rc 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/syssetup_Cz.rc 2005-11-27 22:27:35 UTC (rev 19702) @@ -130,8 +130,8 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Some text...", IDC_STATIC, 53, 7, 253, 20 - LTEXT "Some more text...", IDC_STATIC, 53, 29, 253, 20 + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 END _____ Modified: trunk/reactos/lib/syssetup/syssetup_De.rc --- trunk/reactos/lib/syssetup/syssetup_De.rc 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/syssetup_De.rc 2005-11-27 22:27:35 UTC (rev 19702) @@ -132,8 +132,8 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Some text...", IDC_STATIC, 53, 7, 253, 20 - LTEXT "Some more text...", IDC_STATIC, 53, 29, 253, 20 + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 END _____ Modified: trunk/reactos/lib/syssetup/syssetup_En.rc --- trunk/reactos/lib/syssetup/syssetup_En.rc 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/syssetup_En.rc 2005-11-27 22:27:35 UTC (rev 19702) @@ -132,8 +132,8 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Some text...", IDC_STATIC, 53, 7, 253, 20 - LTEXT "Some more text...", IDC_STATIC, 53, 29, 253, 20 + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 END @@ -198,5 +198,17 @@ IDS_CMT_WINEMINE "WineMine" END +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS Setup" + IDS_UNKNOWN_ERROR "Unknown error" + IDS_REGISTERING_COMPONENTS "Registering components..." + IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " + IDS_GETPROCADDR_FAILED "GetProcAddr failed: " + IDS_REGSVR_FAILED "DllRegisterServer failed: " + IDS_DLLINSTALL_FAILED "DllInstall failed: " + IDS_TIMEOUT "Timeout during registration" + IDS_REASON_UNKNOWN "" +END /* EOF */ _____ Modified: trunk/reactos/lib/syssetup/syssetup_Fr.rc --- trunk/reactos/lib/syssetup/syssetup_Fr.rc 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/syssetup_Fr.rc 2005-11-27 22:27:35 UTC (rev 19702) @@ -133,8 +133,8 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Some text...", IDC_STATIC, 53, 7, 253, 20 - LTEXT "Some more text...", IDC_STATIC, 53, 29, 253, 20 + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 END _____ Modified: trunk/reactos/lib/syssetup/syssetup_Hu.rc --- trunk/reactos/lib/syssetup/syssetup_Hu.rc 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/syssetup_Hu.rc 2005-11-27 22:27:35 UTC (rev 19702) @@ -126,8 +126,8 @@ CAPTION "ReactOS TelepÝt§" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Some text...", IDC_STATIC, 53, 7, 253, 20 - LTEXT "Some more text...", IDC_STATIC, 53, 29, 253, 20 + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 END _____ Modified: trunk/reactos/lib/syssetup/syssetup_Ja.rc --- trunk/reactos/lib/syssetup/syssetup_Ja.rc 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/syssetup_Ja.rc 2005-11-27 22:27:35 UTC (rev 19702) @@ -132,8 +132,8 @@ CAPTION "ReactOS âZâbâgâAâbâv" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Some text...", IDC_STATIC, 53, 7, 253, 20 - LTEXT "Some more text...", IDC_STATIC, 53, 29, 253, 20 + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 END _____ Modified: trunk/reactos/lib/syssetup/syssetup_Nl.rc --- trunk/reactos/lib/syssetup/syssetup_Nl.rc 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/syssetup_Nl.rc 2005-11-27 22:27:35 UTC (rev 19702) @@ -27,7 +27,7 @@ BEGIN LTEXT "Welkom bij de Reactos installatiewizard.", IDC_WELCOMETITLE, 115, 8, 195, 24 LTEXT "Deze wizard zal Reactos op je computer installeren. De wizard "\ - "heeft informatie over u en uw computer nodig "\ + "heeft informatie over jou en jouw computer nodig "\ "om Reactos correct in te stellen.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Klik op Volgende om voort te gaan met de installatie.", IDC_STATIC, 115, 169, 195, 17 END @@ -132,8 +132,8 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Some text...", IDC_STATIC, 53, 7, 253, 20 - LTEXT "Some more text...", IDC_STATIC, 53, 29, 253, 20 + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 END _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/syssetup/wizard.c 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,45 +1,55 @@ /* - * ReactOS kernel - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * PROJECT: System setup + * LICENSE: GPL - See COPYING in the top level directory + * PROGRAMMER: Eric Kohl */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: System setup - * FILE: lib/syssetup/wizard.c - * PROGRAMER: Eric Kohl - */ /* INCLUDES *****************************************************************/ +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windows.h> #include <windowsx.h> #include <commctrl.h> #include <tchar.h> #include <string.h> #include <setupapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <syssetup/syssetup.h> +#define NDEBUG +#include <debug.h> + #include "globals.h" #include "resource.h" #define VMWINST +#define PM_REGISTRATION_NOTIFY (WM_APP + 1) + /* Private Message used to communicate progress from the background + registration thread to the main thread. + wParam = 0 Registration in progress + = 1 Registration completed + lParam = Pointer to a REGISTRATIONNOTIFY structure */ + +typedef struct _REGISTRATIONNOTIFY +{ + ULONG Progress; + UINT ActivityID; + LPCWSTR CurrentItem; + LPCWSTR ErrorMessage; +} REGISTRATIONNOTIFY, *PREGISTRATIONNOTIFY; + +typedef struct _REGISTRATIONDATA +{ + HWND hwndDlg; + ULONG DllCount; + ULONG Registered; + PVOID DefaultContext; +} REGISTRATIONDATA, *PREGISTRATIONDATA; + /* GLOBALS ******************************************************************/ static SETUPDATA SetupData; @@ -1292,6 +1302,248 @@ } +static UINT CALLBACK +RegistrationNotificationProc(PVOID Context, + UINT Notification, + UINT_PTR Param1, + UINT_PTR Param2) +{ + PREGISTRATIONDATA RegistrationData; + REGISTRATIONNOTIFY RegistrationNotify; + PSP_REGISTER_CONTROL_STATUSW StatusInfo; + UINT MessageID; + WCHAR ErrorMessage[128]; + + RegistrationData = (PREGISTRATIONDATA) Context; + + if (SPFILENOTIFY_STARTREGISTRATION == Notification || + SPFILENOTIFY_ENDREGISTRATION == Notification) + { + StatusInfo = (PSP_REGISTER_CONTROL_STATUSW) Param1; + RegistrationNotify.CurrentItem = wcsrchr(StatusInfo->FileName, L'\\'); + if (NULL == RegistrationNotify.CurrentItem) + { + RegistrationNotify.CurrentItem = StatusInfo->FileName; + } + else + { + RegistrationNotify.CurrentItem++; + } + + if (SPFILENOTIFY_STARTREGISTRATION == Notification) + { + DPRINT("Received SPFILENOTIFY_STARTREGISTRATION notification for %S\n", + StatusInfo->FileName); + RegistrationNotify.ErrorMessage = NULL; + RegistrationNotify.Progress = RegistrationData->Registered; + } + else + { + DPRINT("Received SPFILENOTIFY_ENDREGISTRATION notification for %S\n", + StatusInfo->FileName); + DPRINT("Win32Error %u FailureCode %u\n", StatusInfo->Win32Error, + StatusInfo->FailureCode); + if (SPREG_SUCCESS != StatusInfo->FailureCode) + { + switch(StatusInfo->FailureCode) + { + case SPREG_LOADLIBRARY: + MessageID = IDS_LOADLIBRARY_FAILED; + break; + case SPREG_GETPROCADDR: + MessageID = IDS_GETPROCADDR_FAILED; + break; + case SPREG_REGSVR: + MessageID = IDS_REGSVR_FAILED; + break; + case SPREG_DLLINSTALL: + MessageID = IDS_DLLINSTALL_FAILED; + break; + case SPREG_TIMEOUT: + MessageID = IDS_TIMEOUT; + break; + default: + MessageID = IDS_REASON_UNKNOWN; + break; + } + if (0 == LoadStringW(hDllInstance, MessageID, + ErrorMessage, + sizeof(ErrorMessage) / + sizeof(ErrorMessage[0]))) + { + ErrorMessage[0] = L'\0'; + } + if (SPREG_TIMEOUT != StatusInfo->FailureCode) + { + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, + StatusInfo->Win32Error, 0, + ErrorMessage + wcslen(ErrorMessage), + sizeof(ErrorMessage) / sizeof(ErrorMessage[0]) - + wcslen(ErrorMessage), NULL); + } + RegistrationNotify.ErrorMessage = ErrorMessage; + } + else + { + RegistrationNotify.ErrorMessage = NULL; + } + if (RegistrationData->Registered < RegistrationData->DllCount) + { + RegistrationData->Registered++; + } + } + + RegistrationNotify.Progress = RegistrationData->Registered; + RegistrationNotify.ActivityID = IDS_REGISTERING_COMPONENTS; + SendMessage(RegistrationData->hwndDlg, PM_REGISTRATION_NOTIFY, + 0, (LPARAM) &RegistrationNotify); + + return FILEOP_DOIT; + } + else + { + DPRINT1("Received unexpected notification %u\n", Notification); + return SetupDefaultQueueCallback(RegistrationData->DefaultContext, + Notification, Param1, Param2); + } +} + + +static DWORD CALLBACK +RegistrationProc(LPVOID Parameter) +{ + PREGISTRATIONDATA RegistrationData; + REGISTRATIONNOTIFY RegistrationNotify; + DWORD LastError; + WCHAR UnknownError[84]; + + RegistrationData = (PREGISTRATIONDATA) Parameter; + RegistrationData->Registered = 0; + RegistrationData->DefaultContext = SetupInitDefaultQueueCallback(RegistrationData->hwndDlg); + + if (SetupInstallFromInfSectionW(GetParent(RegistrationData->hwndDlg), + hSysSetupInf, + L"RegistrationPhase2", + SPINST_REGISTRY | + SPINST_REGISTERCALLBACKAWARE | + SPINST_REGSVR, + 0, + NULL, + 0, + RegistrationNotificationProc, + RegistrationData, + NULL, + NULL)) + { + RegistrationNotify.ErrorMessage = NULL; + } + else + { + LastError = GetLastError(); + DPRINT1("SetupInstallFromInfSection failed with error %u\n", + LastError); + if (0 == FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, NULL, LastError, 0, + (LPWSTR) &RegistrationNotify.ErrorMessage, 0, + NULL)) + { + if (0 == LoadStringW(hDllInstance, IDS_UNKNOWN_ERROR, + UnknownError, + sizeof(UnknownError) / sizeof(UnknownError[0] - + 20))) + { + wcscpy(UnknownError, L"Unknown error"); + } + wcscat(UnknownError, L" "); + _ultow(LastError, UnknownError + wcslen(UnknownError), 10); + RegistrationNotify.ErrorMessage = UnknownError; + } + } + + RegistrationNotify.Progress = RegistrationData->DllCount; + RegistrationNotify.ActivityID = IDS_REGISTERING_COMPONENTS; + RegistrationNotify.CurrentItem = NULL; + SendMessage(RegistrationData->hwndDlg, PM_REGISTRATION_NOTIFY, + 1, (LPARAM) &RegistrationNotify); + if (NULL != RegistrationNotify.ErrorMessage && + UnknownError != RegistrationNotify.ErrorMessage) + { + LocalFree((PVOID) RegistrationNotify.ErrorMessage); + } + + SetupTermDefaultQueueCallback(RegistrationData->DefaultContext); + HeapFree(GetProcessHeap(), 0, RegistrationData); + + return 0; +} + + +static BOOL +StartComponentRegistration(HWND hwndDlg, PULONG MaxProgress) +{ + HANDLE RegistrationThread; + LONG DllCount; + INFCONTEXT Context; + WCHAR SectionName[512]; + PREGISTRATIONDATA RegistrationData; + + DllCount = -1; + if (! SetupFindFirstLineW(hSysSetupInf, L"RegistrationPhase2", + L"RegisterDlls", &Context)) + { + DPRINT1("No RegistrationPhase2 section found\n"); + return FALSE; + } + if (! SetupGetStringFieldW(&Context, 1, SectionName, + sizeof(SectionName) / sizeof(SectionName[0]), + NULL)) + { + DPRINT1("Unable to retrieve section name\n"); + return FALSE; + } + DllCount = SetupGetLineCountW(hSysSetupInf, SectionName); + DPRINT("SectionName %S DllCount %ld\n", SectionName, DllCount); + if (DllCount < 0) + { + SetLastError(STATUS_NOT_FOUND); + return FALSE; + } + + *MaxProgress = (ULONG) DllCount; + + /* + * Create a background thread to do the actual registrations, so the + * main thread can just run its message loop. + */ + RegistrationThread = NULL; + RegistrationData = HeapAlloc(GetProcessHeap(), 0, + sizeof(REGISTRATIONDATA)); + if (NULL != RegistrationData) + { + RegistrationData->hwndDlg = hwndDlg; + RegistrationData->DllCount = DllCount; + RegistrationThread = CreateThread(NULL, 0, RegistrationProc, + (LPVOID) RegistrationData, 0, NULL); + if (NULL != RegistrationThread) + { + CloseHandle(RegistrationThread); + } + else + { + DPRINT1("CreateThread failed, error %u\n", GetLastError()); + return FALSE; + } + } + else + { + DPRINT1("HeapAlloc() failed, error %u\n", GetLastError()); + return FALSE; + } + + return TRUE; +} + + static INT_PTR CALLBACK ProcessPageDlgProc(HWND hwndDlg, UINT uMsg, @@ -1299,6 +1551,8 @@ LPARAM lParam) { PSETUPDATA SetupData; + PREGISTRATIONNOTIFY RegistrationNotify; + WCHAR Title[64]; /* Retrieve pointer to the global setup data */ SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); @@ -1313,39 +1567,10 @@ } break; - case WM_TIMER: - { - INT Position; - HWND hWndProgress; - - hWndProgress = GetDlgItem(hwndDlg, IDC_PROCESSPROGRESS); - Position = SendMessage(hWndProgress, PBM_GETPOS, 0, 0); - if (Position == 2) - { - KillTimer(hwndDlg, 1); - - /* Enable the Back and Next buttons */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); - PropSheet_PressButton(GetParent(hwndDlg), PSBTN_NEXT); - } - else - { -#ifdef VMWINST - if (Position == 1) - { - KillTimer(hwndDlg, 1); - RunVMWInstall(GetParent(hwndDlg)); - SetTimer(hwndDlg, 1, 50, NULL); - } -#endif - SendMessage(hWndProgress, PBM_SETPOS, Position + 1, 0); - } - } - return TRUE; - case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; + ULONG MaxProgress; switch (lpnm->code) { @@ -1353,9 +1578,12 @@ /* Disable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), 0); - SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETRANGE, 0, - MAKELPARAM(0, 2)); - SetTimer(hwndDlg, 1, 50, NULL); + StartComponentRegistration(hwndDlg, &MaxProgress); + + SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETRANGE, + 0, MAKELPARAM(0, MaxProgress)); + SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, + 0, 0); break; case PSN_WIZNEXT: @@ -1367,6 +1595,47 @@ } break; + case PM_REGISTRATION_NOTIFY: + { + WCHAR Activity[64]; + RegistrationNotify = (PREGISTRATIONNOTIFY) lParam; + if (0 != LoadStringW(hDllInstance, RegistrationNotify->ActivityID, + Activity, + sizeof(Activity) / sizeof(Activity[0]))) + { + SendDlgItemMessageW(hwndDlg, IDC_ACTIVITY, WM_SETTEXT, + 0, (LPARAM) Activity); + } + SendDlgItemMessageW(hwndDlg, IDC_ITEM, WM_SETTEXT, 0, + (LPARAM)(NULL == RegistrationNotify->CurrentItem ? + L"" : RegistrationNotify->CurrentItem)); + SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, + RegistrationNotify->Progress, 0); + if (NULL != RegistrationNotify->ErrorMessage) + { + if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, + Title, sizeof(Title) / sizeof(Title[0]))) + { + wcscpy(Title, L"ReactOS Setup"); + } + MessageBoxW(hwndDlg, RegistrationNotify->ErrorMessage, + Title, MB_ICONERROR | MB_OK); + + } + + if (wParam) + { +#ifdef VMWINST + RunVMWInstall(GetParent(hwndDlg)); +#endif + + /* Enable the Back and Next buttons */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + PropSheet_PressButton(GetParent(hwndDlg), PSBTN_NEXT); + } + } + return TRUE; + default: break; } _____ Modified: trunk/reactos/lib/wininet/wininet.xml --- trunk/reactos/lib/wininet/wininet.xml 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/lib/wininet/wininet.xml 2005-11-27 22:27:35 UTC (rev 19702) @@ -1,4 +1,5 @@ <module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}" installbase="system32" installname="wininet.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="wininet.spec.def" /> <include base="wininet">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/media/inf/syssetup.inf.tpl --- trunk/reactos/media/inf/syssetup.inf.tpl 2005-11-27 22:13:00 UTC (rev 19701) +++ trunk/reactos/media/inf/syssetup.inf.tpl 2005-11-27 22:27:35 UTC (rev 19702) @@ -23,4 +23,7 @@ NET_NIC.inf ports.inf scsi.inf -usbport.inf \ No newline at end of file +usbport.inf + +[RegistrationPhase2] +RegisterDlls=OleControlDlls

1 0

[hpoussin] 19701: Keep remote machine name in device info set. Use it when needed
by hpoussin＠svn.reactos.com 27 Nov '05

27 Nov '05

Keep remote machine name in device info set. Use it when needed Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-27 21:31:35 UTC (rev 19700) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-27 22:13:00 UTC (rev 19701) @@ -632,6 +632,7 @@ { struct DeviceInfoSet *list; LPWSTR UNCServerName = NULL; + DWORD size; DWORD rc; //CONFIGRET cr; HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;; @@ -639,7 +640,10 @@ TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, debugstr_w(MachineName), Reserved); - list = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfoSet)); + size = sizeof(struct DeviceInfoSet); + if (MachineName) + size += (wcslen(MachineName) + 3) * sizeof(WCHAR); + list = HeapAlloc(GetProcessHeap(), 0, size); if (!list) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -671,6 +675,9 @@ } strcpyW(UNCServerName + 2, MachineName); + list->szData[0] = list->szData[1] = '\\'; + strcpyW(list->szData + 2, MachineName); + list->MachineName = list->szData; } else { @@ -684,6 +691,7 @@ } if (!GetComputerNameW(UNCServerName + 2, &Size)) goto cleanup; + list->MachineName = NULL; } #if 0 UNCServerName[0] = UNCServerName[1] = '\\'; @@ -3336,7 +3344,10 @@ &list->ClassGuid, sizeof(GUID)); DeviceInfoListDetailData->RemoteMachineHandle = list->hMachine; - DeviceInfoListDetailData->RemoteMachineName[0] = 0; /* FIXME */ + if (list->MachineName) + strcpyW(DeviceInfoListDetailData->RemoteMachineName, list->MachineName + 2); + else + DeviceInfoListDetailData->RemoteMachineName[0] = 0; ret = TRUE; } @@ -3639,8 +3650,8 @@ hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_QUERY_VALUE); else { - /* FIXME: what if DeviceInfoSet is a remote device info set? */ - hKey = SetupDiOpenClassRegKey(&list->ClassGuid, KEY_QUERY_VALUE); + hKey = SetupDiOpenClassRegKeyExW(&list->ClassGuid, KEY_QUERY_VALUE, + DIOCR_INSTALLER, list->MachineName + 2, NULL); } if (hKey == INVALID_HANDLE_VALUE) goto cleanup; _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-27 21:31:35 UTC (rev 19700) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-27 22:13:00 UTC (rev 19701) @@ -144,6 +144,12 @@ LIST_ENTRY DriverListHead; /* List of struct DriverInfoElement */ LIST_ENTRY ListHead; /* List of struct DeviceInfoElement */ + + /* Contains the name of the remote computer ('\\COMPUTERNAME' for example), + * or NULL if related to local machine. Points into szData field at the + * end of the structure */ + PCWSTR MachineName; + WCHAR szData[0]; }; extern HINSTANCE hInstance;

1 0

[turner] 19700: Structure member name changes. Alex just told me what to do. ; )
by turner＠svn.reactos.com 27 Nov '05

27 Nov '05

Structure member name changes. Alex just told me what to do. ;) Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c --- trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-11-27 21:00:09 UTC (rev 19699) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-11-27 21:31:35 UTC (rev 19700) @@ -128,9 +128,9 @@ KdbpTrapFrameToKdbTrapFrame(PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFrame) { /* Copy the TrapFrame only up to Eflags and zero the rest*/ - RtlCopyMemory(&KdbTrapFrame->Tf, TrapFrame, FIELD_OFFSET(KTRAP_FRAME, Esp)); - RtlZeroMemory((PVOID)((ULONG_PTR)&KdbTrapFrame->Tf + FIELD_OFFSET(KTRAP_FRAME, Esp)), - sizeof (KTRAP_FRAME) - FIELD_OFFSET(KTRAP_FRAME, Esp)); + RtlCopyMemory(&KdbTrapFrame->Tf, TrapFrame, FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)); + RtlZeroMemory((PVOID)((ULONG_PTR)&KdbTrapFrame->Tf + FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)), + sizeof (KTRAP_FRAME) - FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)); asm volatile( "movl %%cr0, %0" "\n\t" "movl %%cr2, %1" "\n\t" @@ -139,8 +139,8 @@ : "=r"(KdbTrapFrame->Cr0), "=r"(KdbTrapFrame->Cr2), "=r"(KdbTrapFrame->Cr3), "=r"(KdbTrapFrame->Cr4)); - KdbTrapFrame->Tf.Esp = KiEspFromTrapFrame(TrapFrame); - KdbTrapFrame->Tf.Ss = (USHORT)(KiSsFromTrapFrame(TrapFrame) & 0xFFFF); + KdbTrapFrame->Tf.HardwareEsp = KiEspFromTrapFrame(TrapFrame); + KdbTrapFrame->Tf.HardwareSegSs = (USHORT)(KiSsFromTrapFrame(TrapFrame) & 0xFFFF); /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ @@ -150,12 +150,12 @@ KdbpKdbTrapFrameToTrapFrame(PKDB_KTRAP_FRAME KdbTrapFrame, PKTRAP_FRAME TrapFrame) { /* Copy the TrapFrame only up to Eflags and zero the rest*/ - RtlCopyMemory(TrapFrame, &KdbTrapFrame->Tf, FIELD_OFFSET(KTRAP_FRAME, Esp)); + RtlCopyMemory(TrapFrame, &KdbTrapFrame->Tf, FIELD_OFFSET(KTRAP_FRAME, HardwareEsp)); /* FIXME: write cr0, cr2, cr3 and cr4 (not needed atm) */ - KiSsToTrapFrame(TrapFrame, KdbTrapFrame->Tf.Ss); - KiEspToTrapFrame(TrapFrame, KdbTrapFrame->Tf.Esp); + KiSsToTrapFrame(TrapFrame, KdbTrapFrame->Tf.HardwareSegSs); + KiEspToTrapFrame(TrapFrame, KdbTrapFrame->Tf.HardwareEsp); /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ } @@ -330,7 +330,7 @@ IntVect = 3; else if (Mem[0] == 0xcd) IntVect = Mem[1]; - else if (Mem[0] == 0xce && KdbCurrentTrapFrame->Tf.Eflags & (1<<11)) /* 1 << 11 is the overflow flag */ + else if (Mem[0] == 0xce && KdbCurrentTrapFrame->Tf.EFlags & (1<<11)) /* 1 << 11 is the overflow flag */ IntVect = 4; else return FALSE; @@ -1177,7 +1177,7 @@ IN OUT PKTRAP_FRAME TrapFrame, IN BOOLEAN FirstChance) { - ULONG ExpNr = (ULONG)TrapFrame->DebugArgMark; + ULONG ExpNr = (ULONG)TrapFrame->DbgArgMark; KDB_ENTER_CONDITION EnterCondition; KD_CONTINUE_TYPE ContinueType = kdHandleException; PKDB_BREAKPOINT BreakPoint; @@ -1245,7 +1245,7 @@ else if (BreakPoint->Type == KdbBreakPointTemporary && BreakPoint->Process == KdbCurrentProcess) { - ASSERT((TrapFrame->Eflags & X86_EFLAGS_TF) == 0); + ASSERT((TrapFrame->EFlags & X86_EFLAGS_TF) == 0); /* * Delete the temporary breakpoint which was used to step over or into the instruction. @@ -1257,7 +1257,7 @@ if ((KdbSingleStepOver && !KdbpStepOverInstruction(TrapFrame->Eip)) || (!KdbSingleStepOver && !KdbpStepIntoInstruction(TrapFrame->Eip))) { - TrapFrame->Eflags |= X86_EFLAGS_TF; + TrapFrame->EFlags |= X86_EFLAGS_TF; } goto continue_execution; /* return */ } @@ -1273,7 +1273,7 @@ BreakPoint->Type == KdbBreakPointTemporary) { ASSERT(ExpNr == 3); - TrapFrame->Eflags |= X86_EFLAGS_TF; + TrapFrame->EFlags |= X86_EFLAGS_TF; KdbBreakPointToReenable = BreakPoint; } @@ -1307,7 +1307,7 @@ if (BreakPoint->Type == KdbBreakPointSoftware) { DbgPrint("Entered debugger on breakpoint #%d: EXEC 0x%04x:0x%08x\n", - KdbLastBreakPointNr, TrapFrame->Cs & 0xffff, TrapFrame->Eip); + KdbLastBreakPointNr, TrapFrame->SegCs & 0xffff, TrapFrame->Eip); } else if (BreakPoint->Type == KdbBreakPointHardware) { @@ -1346,7 +1346,7 @@ /* Unset TF if we are no longer single stepping. */ if (KdbNumSingleSteps == 0) - TrapFrame->Eflags &= ~X86_EFLAGS_TF; + TrapFrame->EFlags &= ~X86_EFLAGS_TF; goto continue_execution; /* return */ } @@ -1359,16 +1359,16 @@ if ((KdbSingleStepOver && KdbpStepOverInstruction(TrapFrame->Eip)) || (!KdbSingleStepOver && KdbpStepIntoInstruction(TrapFrame->Eip))) { - TrapFrame->Eflags &= ~X86_EFLAGS_TF; + TrapFrame->EFlags &= ~X86_EFLAGS_TF; } else { - TrapFrame->Eflags |= X86_EFLAGS_TF; + TrapFrame->EFlags |= X86_EFLAGS_TF; } goto continue_execution; /* return */ } - TrapFrame->Eflags &= ~X86_EFLAGS_TF; + TrapFrame->EFlags &= ~X86_EFLAGS_TF; KdbEnteredOnSingleStep = TRUE; } else @@ -1393,7 +1393,7 @@ } DbgPrint("Entered debugger on embedded INT3 at 0x%04x:0x%08x.\n", - TrapFrame->Cs & 0xffff, TrapFrame->Eip - 1); + TrapFrame->SegCs & 0xffff, TrapFrame->Eip - 1); } else { @@ -1414,7 +1414,7 @@ ULONG_PTR Cr2; ULONG Err; asm volatile("movl %%cr2, %0" : "=r"(Cr2)); - Err = TrapFrame->ErrorCode; + Err = TrapFrame->ErrCode; DbgPrint("Memory at 0x%p could not be %s: ", Cr2, (Err & (1 << 1)) ? "written" : "read"); if ((Err & (1 << 0)) == 0) DbgPrint("Page not present.\n"); @@ -1459,12 +1459,12 @@ if ((KdbSingleStepOver && KdbpStepOverInstruction(KdbCurrentTrapFrame->Tf.Eip)) || (!KdbSingleStepOver && KdbpStepIntoInstruction(KdbCurrentTrapFrame->Tf.Eip))) { - ASSERT((KdbCurrentTrapFrame->Tf.Eflags & X86_EFLAGS_TF) == 0); - /*KdbCurrentTrapFrame->Tf.Eflags &= ~X86_EFLAGS_TF;*/ + ASSERT((KdbCurrentTrapFrame->Tf.EFlags & X86_EFLAGS_TF) == 0); + /*KdbCurrentTrapFrame->Tf.EFlags &= ~X86_EFLAGS_TF;*/ } else { - KdbCurrentTrapFrame->Tf.Eflags |= X86_EFLAGS_TF; + KdbCurrentTrapFrame->Tf.EFlags |= X86_EFLAGS_TF; } } @@ -1496,7 +1496,7 @@ /* Set the RF flag so we don't trigger the same breakpoint again. */ if (Resume) { - TrapFrame->Eflags |= X86_EFLAGS_RF; + TrapFrame->EFlags |= X86_EFLAGS_RF; } /* Clear dr6 status flags. */ _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-11-27 21:00:09 UTC (rev 19699) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-11-27 21:31:35 UTC (rev 19700) @@ -379,28 +379,28 @@ " ECX 0x%08x EDX 0x%08x\n" " ESI 0x%08x EDI 0x%08x\n" " EBP 0x%08x\n", - Tf->Cs & 0xFFFF, Tf->Eip, - Tf->Ss, Tf->Esp, + Tf->SegCs & 0xFFFF, Tf->Eip, + Tf->HardwareSegSs, Tf->HardwareEsp, Tf->Eax, Tf->Ebx, Tf->Ecx, Tf->Edx, Tf->Esi, Tf->Edi, Tf->Ebp); - KdbpPrint("EFLAGS 0x%08x ", Tf->Eflags); + KdbpPrint("EFLAGS 0x%08x ", Tf->EFlags); for (i = 0; i < 32; i++) { if (i == 1) { - if ((Tf->Eflags & (1 << 1)) == 0) + if ((Tf->EFlags & (1 << 1)) == 0) KdbpPrint(" !BIT1"); } else if (i == 12) { - KdbpPrint(" IOPL%d", (Tf->Eflags >> 12) & 3); + KdbpPrint(" IOPL%d", (Tf->EFlags >> 12) & 3); } else if (i == 13) { } - else if ((Tf->Eflags & (1 << i)) != 0) + else if ((Tf->EFlags & (1 << i)) != 0) KdbpPrint(EflagsBits[i]); } KdbpPrint("\n"); @@ -461,18 +461,18 @@ else if (Argv[0][0] == 's') /* sregs */ { KdbpPrint("CS 0x%04x Index 0x%04x %cDT RPL%d\n", - Tf->Cs & 0xffff, (Tf->Cs & 0xffff) >> 3, - (Tf->Cs & (1 << 2)) ? 'L' : 'G', Tf->Cs & 3); + Tf->SegCs & 0xffff, (Tf->SegCs & 0xffff) >> 3, + (Tf->SegCs & (1 << 2)) ? 'L' : 'G', Tf->SegCs & 3); KdbpPrint("DS 0x%04x Index 0x%04x %cDT RPL%d\n", - Tf->Ds, Tf->Ds >> 3, (Tf->Ds & (1 << 2)) ? 'L' : 'G', Tf->Ds & 3); + Tf->SegDs, Tf->SegDs >> 3, (Tf->SegDs & (1 << 2)) ? 'L' : 'G', Tf->SegDs & 3); KdbpPrint("ES 0x%04x Index 0x%04x %cDT RPL%d\n", - Tf->Es, Tf->Es >> 3, (Tf->Es & (1 << 2)) ? 'L' : 'G', Tf->Es & 3); + Tf->SegEs, Tf->SegEs >> 3, (Tf->SegEs & (1 << 2)) ? 'L' : 'G', Tf->SegEs & 3); KdbpPrint("FS 0x%04x Index 0x%04x %cDT RPL%d\n", - Tf->Fs, Tf->Fs >> 3, (Tf->Fs & (1 << 2)) ? 'L' : 'G', Tf->Fs & 3); + Tf->SegFs, Tf->SegFs >> 3, (Tf->SegFs & (1 << 2)) ? 'L' : 'G', Tf->SegFs & 3); KdbpPrint("GS 0x%04x Index 0x%04x %cDT RPL%d\n", - Tf->Gs, Tf->Gs >> 3, (Tf->Gs & (1 << 2)) ? 'L' : 'G', Tf->Gs & 3); + Tf->SegGs, Tf->SegGs >> 3, (Tf->SegGs & (1 << 2)) ? 'L' : 'G', Tf->SegGs & 3); KdbpPrint("SS 0x%04x Index 0x%04x %cDT RPL%d\n", - Tf->Ss, Tf->Ss >> 3, (Tf->Ss & (1 << 2)) ? 'L' : 'G', Tf->Ss & 3); + Tf->HardwareSegSs, Tf->HardwareSegSs >> 3, (Tf->HardwareSegSs & (1 << 2)) ? 'L' : 'G', Tf->HardwareSegSs & 3); } else /* dregs */ { @@ -940,10 +940,10 @@ if (Thread->Tcb.TrapFrame != NULL) { - if (Thread->Tcb.TrapFrame->PreviousMode == KernelMode) + if (Thread->Tcb.TrapFrame->PreviousPreviousMode == KernelMode) Esp = (PULONG)Thread->Tcb.TrapFrame->TempEsp; else - Esp = (PULONG)Thread->Tcb.TrapFrame->Esp; + Esp = (PULONG)Thread->Tcb.TrapFrame->HardwareEsp; Ebp = (PULONG)Thread->Tcb.TrapFrame->Ebp; Eip = Thread->Tcb.TrapFrame->Eip; } @@ -1466,35 +1466,15 @@ KTSS *Tss = KeGetCurrentKPCR()->TSS; KdbpPrint("Current TSS is at 0x%08x.\n", (INT)Tss); - KdbpPrint(" PreviousTask: 0x%08x\n" - " Ss0:Esp0: 0x%04x:0x%08x\n" - " Ss1:Esp1: 0x%04x:0x%08x\n" - " Ss2:Esp2: 0x%04x:0x%08x\n" - " Cr3: 0x%08x\n" - " Eip: 0x%08x\n" - " Eflags: 0x%08x\n" - " Eax: 0x%08x\n" - " Ecx: 0x%08x\n" - " Edx: 0x%08x\n" - " Ebx: 0x%08x\n" - " Esp: 0x%08x\n" - " Ebp: 0x%08x\n" - " Esi: 0x%08x\n" - " Edi: 0x%08x\n" + KdbpPrint(" Eip: 0x%08x\n" " Es: 0x%04x\n" " Cs: 0x%04x\n" " Ss: 0x%04x\n" " Ds: 0x%04x\n" " Fs: 0x%04x\n" " Gs: 0x%04x\n" - " Ldt: 0x%04x\n" - " Trap: 0x%04x\n" " IoMapBase: 0x%04x\n", - Tss->PreviousTask, Tss->Ss0, Tss->Esp0, Tss->Ss1, Tss->Esp1, - Tss->Ss2, Tss->Esp2, Tss->Cr3, Tss->Eip, Tss->Eflags, Tss->Eax, - Tss->Ecx, Tss->Edx, Tss->Ebx, Tss->Esp, Tss->Ebp, Tss->Esi, - Tss->Edi, Tss->Es, Tss->Cs, Tss->Ss, Tss->Ds, Tss->Fs, Tss->Gs, - Tss->Ldt, Tss->Trap, Tss->IoMapBase); + Tss->Eip, Tss->Es, Tss->Cs, Tss->Ds, Tss->Fs, Tss->Gs, Tss->IoMapBase); return TRUE; } _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c --- trunk/reactos/ntoskrnl/kdbg/kdb_expr.c 2005-11-27 21:00:09 UTC (rev 19699) +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c 2005-11-27 21:31:35 UTC (rev 19700) @@ -93,21 +93,21 @@ STATIC CONST struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] = { {"eip", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eip), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eip)}, - {"eflags", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eflags), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eflags)}, + {"eflags", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.EFlags), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.EFlags)}, {"eax", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eax), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eax)}, {"ebx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ebx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ebx)}, {"ecx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ecx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ecx)}, {"edx", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edx)}, {"esi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esi)}, {"edi", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Edi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Edi)}, - {"esp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Esp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Esp)}, + {"esp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.HardwareEsp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.HardwareEsp)}, {"ebp", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ebp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ebp)}, - {"cs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Cs), 2 }, /* Use only the lower 2 bytes */ - {"ds", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ds), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ds)}, - {"es", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Es), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Es)}, - {"fs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Fs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Fs)}, - {"gs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Gs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Gs)}, - {"ss", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Ss), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Ss)}, + {"cs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegCs), 2 }, /* Use only the lower 2 bytes */ + {"ds", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegDs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegDs)}, + {"es", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegEs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegEs)}, + {"fs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegFs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegFs)}, + {"gs", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.SegGs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.SegGs)}, + {"ss", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.HardwareSegSs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.HardwareSegSs)}, {"dr0", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr0), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr0)}, {"dr1", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr1), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr1)}, {"dr2", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Dr2), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Dr2)},

1 0

[hpoussin] 19699: Write connection name at the right place in registry.
by hpoussin＠svn.reactos.com 27 Nov '05

27 Nov '05

Write connection name at the right place in registry. Add PnpInstanceId and ShowIcon values Modified: trunk/reactos/lib/netcfgx/netcfgx.c _____ Modified: trunk/reactos/lib/netcfgx/netcfgx.c --- trunk/reactos/lib/netcfgx/netcfgx.c 2005-11-27 20:59:09 UTC (rev 19698) +++ trunk/reactos/lib/netcfgx/netcfgx.c 2005-11-27 21:00:09 UTC (rev 19699) @@ -100,11 +100,13 @@ { RPC_STATUS RpcStatus; UUID Uuid; + LPWSTR InstanceId = NULL; LPWSTR UuidRpcString = NULL; LPWSTR UuidString = NULL; LPWSTR DeviceName = NULL; LPWSTR ExportName = NULL; LONG rc; + DWORD dwShowIcon, dwLength; HKEY hKey = INVALID_HANDLE_VALUE; HKEY hLinkageKey = INVALID_HANDLE_VALUE; HKEY hNetworkKey = INVALID_HANDLE_VALUE; @@ -115,6 +117,27 @@ DPRINT("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + /* Get Instance ID */ + if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) + { + DPRINT("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE expected\n"); + rc = ERROR_GEN_FAILURE; + goto cleanup; + } + InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (!InstanceId) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + if (!SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, InstanceId, dwLength, NULL)) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); + goto cleanup; + } + /* Create a new UUID */ RpcStatus = UuidCreate(&Uuid); if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY) @@ -263,20 +286,39 @@ DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } - rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); + rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey, NULL); if (rc != ERROR_SUCCESS) { DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); goto cleanup; } - rc = RegSetValueExW(hKey, L"Name", 0, REG_SZ, (const BYTE*)L"Network connection", (wcslen(L"Network connection") + 1) * sizeof(WCHAR)); + rc = RegCreateKeyExW(hKey, L"Connection", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hConnectionKey, NULL); + RegCloseKey(hKey); + hKey = INVALID_HANDLE_VALUE; if (rc != ERROR_SUCCESS) { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hConnectionKey, L"Name", 0, REG_SZ, (const BYTE*)L"Network connection", (wcslen(L"Network connection") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } - RegCloseKey(hKey); - hKey = INVALID_HANDLE_VALUE; + rc = RegSetValueExW(hConnectionKey, L"PnpInstanceId", 0, REG_SZ, (const BYTE*)InstanceId, (wcslen(InstanceId) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + dwShowIcon = 1; + rc = RegSetValueExW(hConnectionKey, L"ShowIcon", 0, REG_DWORD, (const BYTE*)&dwShowIcon, sizeof(dwShowIcon)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } /* Write linkage information in Tcpip service */ rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &hKey, NULL); @@ -309,6 +351,7 @@ cleanup: if (UuidRpcString != NULL) RpcStringFreeW(&UuidRpcString); + HeapFree(GetProcessHeap(), 0, InstanceId); HeapFree(GetProcessHeap(), 0, UuidString); HeapFree(GetProcessHeap(), 0, DeviceName); HeapFree(GetProcessHeap(), 0, ExportName);

1 0

[hpoussin] 19698: Small cleanup/fixes:
by hpoussin＠svn.reactos.com 27 Nov '05

27 Nov '05

Small cleanup/fixes: - Don't open registry keys with full access rights - Replace OutputDebugString by DPRINT Modified: trunk/reactos/lib/cpl/ncpa/ncpa.c Modified: trunk/reactos/lib/cpl/ncpa/ncpa.h _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.c --- trunk/reactos/lib/cpl/ncpa/ncpa.c 2005-11-27 20:18:33 UTC (rev 19697) +++ trunk/reactos/lib/cpl/ncpa/ncpa.c 2005-11-27 20:59:09 UTC (rev 19698) @@ -15,8 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id$ - * +/* * PROJECT: ReactOS Network Control Panel * FILE: lib/cpl/system/ncpa.c * PURPOSE: ReactOS Network Control Panel @@ -53,10 +52,9 @@ #include <iphlpapi.h> #include <commctrl.h> #include <cpl.h> -//#ifdef __REACTOS__ -//#include <Netcfgn.h> -//#endif +#include <debug.h> + #include "resource.h" #include "ncpa.h" @@ -90,11 +88,9 @@ TCHAR tpszName[MAX_PATH]; DWORD dwNameLen = sizeof(tpszName); - if(RegOpenKeyEx(hBaseKey,tpszRegPath,0,KEY_ALL_ACCESS,&hKey)!=ERROR_SUCC ESS) + if(RegOpenKeyEx(hBaseKey,tpszRegPath,0,KEY_ENUMERATE_SUB_KEYS,&hKey)!=ER ROR_SUCCESS) { - OutputDebugString(_T("EnumRegKeys failed (key not found)\r\n")); - OutputDebugString(tpszRegPath); - OutputDebugString(_T("\r\n")); + DPRINT("EnumRegKeys failed (key not found): %S\n", tpszRegPath); return; } @@ -104,14 +100,12 @@ ret = RegEnumKeyEx(hKey,i,tpszName,&dwNameLen,NULL,NULL,NULL,NULL); if(ret != ERROR_SUCCESS) { - OutputDebugString(_T("EnumRegKeys: RegEnumKeyEx failed for\r\n")); - OutputDebugString(tpszName); - OutputDebugString(_T("\r\n")); + DPRINT("EnumRegKeys: RegEnumKeyEx failed for %S (rc 0x%lx)\n", tpszName, ret); break; } _stprintf(pszNewPath,_T("%s\\%s"),tpszRegPath,tpszName); - OutputDebugString(_T("EnumRegKeys: Calling user supplied enum function\r\n")); + DPRINT("EnumRegKeys: Calling user supplied enum function\n"); pCallback(pCookie,hBaseKey,pszNewPath); dwNameLen = sizeof(tpszName); @@ -146,7 +140,7 @@ for (i = 0; i < 100; i++) { _stprintf(tpszSubKey,_T("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D3 6E972-E325-11CE-BFC1-08002BE10318}\\%04d"),i); - if(RegOpenKey(HKEY_LOCAL_MACHINE,tpszSubKey,&hKey)!=ERROR_SUCCESS) + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszSubKey,0,KEY_QUERY_VALUE,&hKey)!= ERROR_SUCCESS) continue; dwType = REG_SZ; dwSize = sizeof(tpszCfgInst2); @@ -181,7 +175,7 @@ // INetCfgComponentPropertyUi *pNetCfgPropUI; hwndDlg = (HWND)pCookie; - if(RegOpenKey(HKEY_LOCAL_MACHINE,tpszSubKey,&hKey)!=ERROR_SUCCESS) + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszSubKey,0,KEY_QUERY_VALUE,&hKey)!= ERROR_SUCCESS) return; dwType = REG_DWORD; @@ -200,7 +194,7 @@ if(RegQueryValueEx(hKey,_T("Description"),NULL,&dwType,(BYTE*)tpszDescri ption,&dwSize)!= ERROR_SUCCESS) return; - RegOpenKey(hKey,_T("Ndi"),&hNDIKey); + RegOpenKeyEx(hKey,_T("Ndi"),0,KEY_QUERY_VALUE,&hNDIKey); dwType = REG_SZ; dwSize = sizeof(tpszNotifyObjectCLSID); if(RegQueryValueEx(hNDIKey,_T("ClsId"),NULL,&dwType,(BYTE*)tpszNotifyObj ectCLSID,&dwSize)!= ERROR_SUCCESS) @@ -258,7 +252,7 @@ MessageBox(hwndDlg,tpszCfgInstanceID,tpszSubKey,MB_ICONSTOP); } - if(RegOpenKey(HKEY_LOCAL_MACHINE,tpszSubKey,&hKey)!=ERROR_SUCCESS) + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszSubKey,0,KEY_QUERY_VALUE,&hKey)!= ERROR_SUCCESS) return 0; dwType = REG_SZ; dwSize = sizeof(tpszDisplayName); @@ -293,7 +287,7 @@ break; _stprintf(tpszHelpKey,_T("%s\\Ndi"),tpszSubKey); - RegOpenKey(HKEY_LOCAL_MACHINE,tpszHelpKey,&hNDIKey); + RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszHelpKey,0,KEY_QUERY_VALUE,&hNDIKey); dwType = REG_SZ; dwSize = sizeof(tpszHelpText); if(RegQueryValueEx(hNDIKey,_T("HelpText"),NULL,&dwType,(BYTE*)tpszHelpTe xt,&dwSize)!= ERROR_SUCCESS) @@ -320,10 +314,9 @@ break; _stprintf(tpszNDIKey,_T("%s\\Ndi"),tpszSubKey); - RegOpenKey(HKEY_LOCAL_MACHINE,tpszNDIKey,&hNDIKey); - dwType = REG_SZ; + RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszNDIKey,0,KEY_QUERY_VALUE,&hNDIKey); dwSize = sizeof(tpszClsIDText); - if(RegQueryValueEx(hNDIKey,_T("ClsId"),NULL,&dwType,(BYTE*)tpszClsIDText ,&dwSize)!= ERROR_SUCCESS) + if(RegQueryValueEx(hNDIKey,_T("ClsId"),NULL,&dwType,(BYTE*)tpszClsIDText ,&dwSize)!= ERROR_SUCCESS || dwType != REG_SZ) ;//return; RegCloseKey(hNDIKey); @@ -342,16 +335,14 @@ { TCHAR tpszAdatperName[MAX_PATH]; swprintf(tpszAdatperName,L"%S",pAdapter->AdapterName); - OutputDebugString(_T("IPHLPAPI returned:\r\n")); - OutputDebugString(tpszAdatperName); - OutputDebugString(_T("\r\n")); + DPRINT("IPHLPAPI returned: %S\n", tpszAdatperName); if(_tcscmp(tpszAdatperName,tpszCfgInstanceID)==0) { DisplayTCPIPProperties(hwndDlg,pAdapter); break; } else { - OutputDebugString(_T("... which is not the TCPIP property sheet\r\n")); + DPRINT("... which is not the TCPIP property sheet\n"); } pAdapter = pAdapter->Next; if(!pAdapter) @@ -387,7 +378,7 @@ // Get the "Name" for this Connection _stprintf(tpszSubKey,_T("System\\CurrentControlSet\\Control\\Network\\{4 D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection"),tpszCfgInstanceID ); - if(RegOpenKey(HKEY_LOCAL_MACHINE,tpszSubKey,&hKey)!=ERROR_SUCCESS) + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszSubKey,0,KEY_QUERY_VALUE,&hKey)!= ERROR_SUCCESS) return; if(RegQueryValueEx(hKey,_T("Name"),NULL,&dwType,(BYTE*)tpszName,&dwSize) !=ERROR_SUCCESS) _stprintf(tpszName,_T("[ERROR]")); @@ -457,7 +448,7 @@ // Get the "Name" for this Connection _stprintf(tpszSubKey,_T("System\\CurrentControlSet\\Control\\Network\\{4 D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection"),tpszCfgInstanceID ); - if (RegOpenKey(HKEY_LOCAL_MACHINE,tpszSubKey,&hKey)!=ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,tpszSubKey,0,KEY_QUERY_VALUE,&hKey)!=ER ROR_SUCCESS) return; if (RegQueryValueEx(hKey,_T("Name"),NULL,&dwType,(BYTE*)tpszName,&dwSize)!= ERROR_SUCCESS) @@ -532,13 +523,11 @@ HWND hwndDlg = (HWND)pCookie; DWORD dwCharacteristics; - OutputDebugString(_T("NetAdapterCallback\r\n")); - OutputDebugString(tpszSubKey); - OutputDebugString(_T("\r\n")); - if(RegOpenKeyEx(hBaseKey,tpszSubKey,0,KEY_ALL_ACCESS,&hKey)!=ERROR_SUCCE SS) + DPRINT("NetAdapterCallback: %S\n", tpszSubKey); + if(RegOpenKeyEx(hBaseKey,tpszSubKey,0,KEY_QUERY_VALUE,&hKey)!=ERROR_SUCC ESS) return; - OutputDebugString(_T("NetAdapterCallback: Reading Characteristics\r\n")); + DPRINT("NetAdapterCallback: Reading Characteristics\n"); dwType = REG_DWORD; dwSize = sizeof(dwCharacteristics); if(RegQueryValueEx(hKey,_T("Characteristics"),NULL,&dwType,(BYTE*)&dwCha racteristics,&dwSize)!=ERROR_SUCCESS) @@ -550,7 +539,7 @@ // if (!(dwCharacteristics & NCF_HAS_UI)) // return; - OutputDebugString(_T("NetAdapterCallback: Reading DriverDesc\r\n")); + DPRINT("NetAdapterCallback: Reading DriverDesc\n"); dwType = REG_SZ; dwSize = sizeof(tpszDisplayName); if (RegQueryValueEx(hKey,_T("DriverDesc"),NULL,&dwType,(BYTE*)tpszDisplayNa me,&dwSize)!= ERROR_SUCCESS) _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.h --- trunk/reactos/lib/cpl/ncpa/ncpa.h 2005-11-27 20:18:33 UTC (rev 19697) +++ trunk/reactos/lib/cpl/ncpa/ncpa.h 2005-11-27 20:59:09 UTC (rev 19698) @@ -13,8 +13,8 @@ extern HINSTANCE hApplet; +extern DWORD DbgPrint(PCHAR Fmt, ...); - #endif // __NCPA_H /* EOF */

1 0

[ion] 19697: - Add the real NT Object Callbacks and #ifdef out the ReactOS ones.
by ion＠svn.reactos.com 27 Nov '05

27 Nov '05

- Add the real NT Object Callbacks and #ifdef out the ReactOS ones. - Add the real NT Loader Parameter Block structures & friends and #ifdef out the ReactOS ones (thanks to Filip Navara for some work on these). Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/obtypes.h _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-27 20:01:57 UTC (rev 19696) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-27 20:18:33 UTC (rev 19697) @@ -1,15 +1,3 @@ -Complete list of NDK Fixmes before 1.0 Release (Nov 27th 2005) --------------------------------------------------------------- -_______________________________________________________________________ _______________ -[CRITICAL] - Breaking compatibility with official structures. -|obtypes.h - Object callbacks are ReactOS only definitions. IFDEF-OUT ADDREAL -|haltypes.h - Loader Parameter Block is ReactOS Version, not NT. IFDEF-OUT ADDREAL -| -[MAJOR] - Using incorrect, missing, or invalid names or definitions. -|extypes.h - Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined. WONTFIX -|______________________________________________________________________ _______________ - - List of ReactOS Applications compiling with the NDK (verify, fix, and optimize their usage) -------------------------------------------------------------- _____ Modified: trunk/reactos/include/ndk/halfuncs.h --- trunk/reactos/include/ndk/halfuncs.h 2005-11-27 20:01:57 UTC (rev 19696) +++ trunk/reactos/include/ndk/halfuncs.h 2005-11-27 20:18:33 UTC (rev 19697) @@ -30,24 +30,28 @@ // // Display Functions // +NTHALAPI BOOLEAN NTAPI HalQueryDisplayOwnership( VOID ); +NTHALAPI VOID NTAPI HalDisplayString( IN PCHAR String ); +NTHALAPI BOOLEAN NTAPI HalQueryDisplayOwnership( VOID ); +NTHALAPI VOID NTAPI HalReleaseDisplayOwnership( @@ -57,12 +61,14 @@ // // Initialization Functions // +NTHALAPI BOOLEAN NTAPI HalAllProcessorsStarted( VOID ); +NTHALAPI VOID NTAPI HalInitializeProcessor( @@ -70,6 +76,7 @@ PVOID ProcessorStack ); +NTHALAPI BOOLEAN NTAPI HalInitSystem( @@ -77,12 +84,14 @@ PLOADER_PARAMETER_BLOCK LoaderBlock ); +NTHALAPI VOID NTAPI HalReturnToFirmware( FIRMWARE_REENTRY Action ); +NTHALAPI BOOLEAN NTAPI HalStartNextProcessor( @@ -93,6 +102,7 @@ // // Interrupt Functions // +NTHALAPI BOOLEAN NTAPI HalBeginSystemInterrupt( @@ -101,6 +111,7 @@ PKIRQL OldIrql ); +NTHALAPI BOOLEAN NTAPI HalDisableSystemInterrupt( @@ -108,6 +119,7 @@ KIRQL Irql ); +NTHALAPI BOOLEAN NTAPI HalEnableSystemInterrupt( @@ -116,6 +128,7 @@ KINTERRUPT_MODE InterruptMode ); +NTHALAPI VOID NTAPI HalEndSystemInterrupt( @@ -123,6 +136,7 @@ ULONG Vector ); +NTHALAPI BOOLEAN NTAPI HalGetEnvironmentVariable( @@ -131,18 +145,21 @@ USHORT ValueLength ); +NTHALAPI VOID NTAPI HalReportResourceUsage( VOID ); +NTHALAPI VOID FASTCALL HalRequestSoftwareInterrupt( KIRQL SoftwareInterruptRequested ); +NTHALAPI VOID NTAPI HalRequestIpi( @@ -152,6 +169,7 @@ // // I/O Functions // +NTHALAPI VOID NTAPI IoAssignDriveLetters( @@ -164,6 +182,7 @@ // // Environment Functions // +NTHALAPI BOOLEAN NTAPI HalSetEnvironmentVariable( _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-11-27 20:01:57 UTC (rev 19696) +++ trunk/reactos/include/ndk/haltypes.h 2005-11-27 20:18:33 UTC (rev 19697) @@ -67,9 +67,125 @@ ULONG Version; } HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; +#ifndef _REACTOS_ // -// Loader Parameter Block Structures (FIXME) +// NLS Data Block // +typedef struct _NLS_TABLE_DATA +{ + PVOID AnsiCodePageData; + PVOID OemCodePageData; + PVOID UnicodeCodePageData; +} NLS_TABLE_DATA, *PNLS_TABLE_DATA; + +// +// Subsystem Specific Loader Blocks +// +typedef struct _PROFILE_PARAMETER_BLOCK +{ + USHORT DockData0; + USHORT DockData1; + USHORT DockData2; + USHORT DockData3; + ULONG DockData3; + ULONG DockData4; +} PROFILE_PARAMETER_BLOCK, *PPROFILE_PARAMETER_BLOCK; + +typedef struct _HEADLESS_LOADER_BLOCK +{ + UCHAR Unknown[0xC]; +} HEADLESS_LOADER_BLOCK, *PHEADLESS_LOADER_BLOCK; + +typedef struct _NETWORK_LOADER_BLOCK +{ + UCHAR Unknown[0xC]; +} NETWORK_LOADER_BLOCK, *PNETWORK_LOADER_BLOCK; + +// +// Extended Loader Parameter Block +// +typedef struct _LOADER_PARAMETER_EXTENSION +{ + ULONG Size; + PROFILE_PARAMETER_BLOCK ProfileParameterBlock; + ULONG MajorVersion; + ULONG MinorVersion; + PVOID SpecialConfigInfFile; + ULONG SpecialConfigInfSize; + PVOID TriageDumpData; + // + // NT 5.1 + // + ULONG NumberOfPages; + PHEADLESS_LOADER_BLOCK HeadlessLoaderBlock; + PVOID Unknown1; + PVOID PrefetchDatabaseBase; + ULONG PrefetchDatabaseSize; + PNETWORK_LOADER_BLOCK NetworkLoaderBlock; + // + // NT 5.2+ + // + PVOID Reserved[2]; + LIST_ENTRY FirmwareListEntry; + PVOID AcpiTableBase; + ULONG AcpiTableSize; +} LOADER_PARAMETER_EXTENSION, *PLOADER_PARAMETER_EXTENSION; + +// +// Architecture specific Loader Parameter Blocks +// +typedef struct _I386_LOADER_BLOCK +{ + PVOID CommonDataArea; + ULONG MachineType; + ULONG Reserved; +} I386_LOADER_BLOCK, *PI386_LOADER_BLOCK; + +// +// Setup Loader Parameter Block +// +typedef struct _SETUP_LOADER_BLOCK +{ + ULONG Unknown[139]; + ULONG Flags; +} SETUP_LOADER_BLOCK, *PSETUP_LOADER_BLOCK; + +// +// Loader Parameter Block +// +typedef struct _LOADER_PARAMETER_BLOCK +{ + LIST_ENTRY LoadOrderListHead; + LIST_ENTRY MemoryDescriptorListHead; + LIST_ENTRY DriverList; + PVOID KernelStack; + PVOID Prcb; + PVOID Process; + PVOID Thread; + ULONG RegistryLength; + PVOID RegistryBase; + PCONFIGURATION_COMPONENT_DATA ConfigurationRoot; + LPSTR ArcBootDeviceName; + LPSTR ArcHalDeviceName; + LPSTR SystemRoot; + LPSTR BootRoot; + LPSTR CommandLine; + PNLS_TABLE_DATA NlsTables; + PARC_DISK_INFORMATION ArcDevices; + PVOID OEMFont; + PSETUP_LOADER_BLOCK SetupLdrBlock; + PLOADER_PARAMETER_EXTENSION LpbExtension; + union + { + I386_LOADER_BLOCK I386; + } u; +} LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; + +#else + +// +// FIXME: ReactOS ONLY +// typedef struct _LOADER_MODULE { ULONG ModStart; @@ -77,7 +193,6 @@ ULONG String; ULONG Reserved; } LOADER_MODULE, *PLOADER_MODULE; - typedef struct _LOADER_PARAMETER_BLOCK { ULONG Flags; @@ -98,6 +213,7 @@ ULONG PageDirectoryEnd; ULONG KernelBase; } LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; +#endif // // Kernel Exports _____ Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-11-27 20:01:57 UTC (rev 19696) +++ trunk/reactos/include/ndk/obtypes.h 2005-11-27 20:18:33 UTC (rev 19697) @@ -117,15 +117,92 @@ ObjectHandleInformation } OBJECT_INFORMATION_CLASS; -/* FUNCTION TYPES ************************************************************/ +// +// Dump Control Structure for Object Debugging +// +typedef struct _OBJECT_DUMP_CONTROL +{ + PVOID Stream; + ULONG Detail; +} OBJECT_DUMP_CONTROL, *POBJECT_DUMP_CONTROL; #ifndef NTOS_MODE_USER +#ifndef _REACTOS_ // -// FIXME: Object Callbacks +// Object Type Callbacks // +typedef VOID +(NTAPI *OB_DUMP_METHOD)( + IN PVOID Object, + IN POB_DUMP_CONTROL Control OPTIONAL +); + typedef NTSTATUS (NTAPI *OB_OPEN_METHOD)( + IN OB_OPEN_REASON Reason, + IN PEPROCESS Process OPTIONAL, + IN PVOID ObjectBody, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount +); + +typedef VOID +(NTAPI *OB_CLOSE_METHOD)( + IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount +); + +typedef VOID +(NTAPI *OB_DELETE_METHOD)( + IN PVOID Object +); + +typedef NTSTATUS +(NTAPI *OB_PARSE_METHOD)( + IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object +); + +typedef NTSTATUS +(NTAPI *OB_SECURITY_METHOD)( + IN PVOID Object, + IN SECURITY_OPERATION_CODE OperationType, + IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG CapturedLength, + IN OUT PSECURITY_DESCRIPTOR *ObjectSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping +); + +typedef NTSTATUS +(NTAPI *OB_QUERYNAME_METHOD)( + IN PVOID Object, + IN BOOLEAN HasObjectName, + OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength +); + +#else + +// +// FIXME: ReactOS ONLY Object Callbacks +// +typedef NTSTATUS +(NTAPI *OB_OPEN_METHOD)( OB_OPEN_REASON Reason, PVOID ObjectBody, PEPROCESS Process, @@ -198,6 +275,8 @@ struct _OBJECT_ATTRIBUTES* ObjectAttributes ); +#endif + #else //

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs