[ros-diffs] [amunger] 23064: Partially sync newdev to trunk: revisions 22222, 22348, 22392, 22731, 22799, 22911, 23035. Merge 23027. Highlights: Adds the stability warning to newdev. Allows the NIC to be ready on third boot.
amunger at svn.reactos.org
amunger at svn.reactos.org
Sat Jul 15 00:48:32 CEST 2006
Author: amunger
Date: Sat Jul 15 02:48:31 2006
New Revision: 23064
URL: http://svn.reactos.org/svn/reactos?rev=23064&view=rev
Log:
Partially sync newdev to trunk: revisions 22222, 22348, 22392, 22731, 22799, 22911, 23035. Merge 23027.
Highlights:
Adds the stability warning to newdev.
Allows the NIC to be ready on third boot.
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/netcfgx/netcfgx.c
branches/ros-branch-0_3_0/reactos/dll/win32/newdev/De.rc
branches/ros-branch-0_3_0/reactos/dll/win32/newdev/En.rc
branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Es.rc
branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc (contents, props changed)
branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc (contents, props changed)
branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Ru.rc
branches/ros-branch-0_3_0/reactos/dll/win32/newdev/newdev.c
branches/ros-branch-0_3_0/reactos/dll/win32/newdev/resource.h
branches/ros-branch-0_3_0/reactos/dll/win32/newdev/wizard.c
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/netcfgx/netcfgx.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/netcfgx/netcfgx.c?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/netcfgx/netcfgx.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/netcfgx/netcfgx.c Sat Jul 15 02:48:31 2006
@@ -188,6 +188,7 @@
HKEY hLinkageKey = NULL;
HKEY hNetworkKey = NULL;
HKEY hConnectionKey = NULL;
+ SP_DEVINSTALL_PARAMS_W installParams;
if (InstallFunction != DIF_INSTALLDEVICE)
return ERROR_DI_DO_DEFAULT;
@@ -437,7 +438,27 @@
* which are installed after its startup. So, we have to reboot to take
* this new netcard into account.
*/
- MessageBox(NULL, TEXT("You need to reboot to finish the installation of your network card."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING);
+ /* Should we reboot? */
+ installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W);
+ if (!SetupDiGetDeviceInstallParamsW(
+ DeviceInfoSet,
+ DeviceInfoData,
+ &installParams))
+ {
+ rc = GetLastError();
+ DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", rc);
+ goto cleanup;
+ }
+ installParams.Flags |= DI_NEEDRESTART;
+ if (!SetupDiSetDeviceInstallParamsW(
+ DeviceInfoSet,
+ DeviceInfoData,
+ &installParams))
+ {
+ rc = GetLastError();
+ DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc);
+ goto cleanup;
+ }
rc = ERROR_SUCCESS;
cleanup:
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/De.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/newdev/De.rc?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/De.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/De.rc Sat Jul 15 02:48:31 2006
@@ -1,6 +1,6 @@
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Hardwareinstallation"
@@ -8,43 +8,44 @@
BEGIN
LTEXT "Willkommen",IDC_WELCOMETITLE,120,8,195,24
LTEXT "Dieser Assistent installiert einen neuen Gerätetreiber für:",
- IDC_STATIC,120,40,195,16
+ IDC_STATIC,120,21,195,16
LTEXT "Klicken Sie auf Weiter um fortzufahren.",IDC_STATIC,120,169,195,17
- LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11
+ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,36,164,11
+ LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16
CONTROL "Treiber automatisch installieren",IDC_RADIO_AUTO,"Button",
BS_AUTORADIOBUTTON,120,112,178,13
CONTROL "Treiber von einer bestimmten Position installieren",IDC_RADIO_MANUAL,
"Button",BS_AUTORADIOBUTTON,120,133,164,14
END
-IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Hardwareinstallation"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Installation fehlgeschlagen",IDC_FINISHTITLE,120,8,195,24
- LTEXT "Der Gerät konnte nicht installiert werden, da kein passender Treiber gefunden werden konnte.",
+ LTEXT "Das Gerät konnte nicht installiert werden, da kein passender Treiber gefunden wurde.",
IDC_STATIC,120,40,195,19
- LTEXT "Klicken Sie auf Zurück, wenn Sie eine Treiber CD oder Diskette haben oder den Pfad zum Treiber kennen.",
+ LTEXT "Klicken Sie auf Zurück, wenn Sie eine Treiber-CD oder -Diskette besitzen oder den Pfad des Treibers kennen.",
IDC_STATIC,120,98,181,24
CONTROL "Diesen Dialog nicht mehr anzeigen",IDC_DONOTSHOWDLG,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11
END
-IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-CAPTION "Device installation"
+CAPTION "Hardwareinstallation"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Installation failed",IDC_FINISHTITLE,120,8,195,24
- LTEXT "The device could not be installed because an unexpected error happened.",
+ LTEXT "Installation fehlgeschlagen",IDC_FINISHTITLE,120,8,195,24
+ LTEXT "Das Gerät konnte aufgrund eines unerwarteten Fehlers nicht installiert werden.",
IDC_STATIC,120,40,195,19
LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11
END
-IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Hardwareinstallation"
FONT 8, "MS Shell Dlg"
@@ -62,7 +63,7 @@
WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL
END
-IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Hardwareinstallation"
FONT 8, "MS Shell Dlg"
@@ -70,7 +71,7 @@
LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16
END
-IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Hardwareinstallation"
FONT 8, "MS Shell Dlg"
@@ -78,7 +79,21 @@
LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16
END
-IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Device installation"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11
+ LTEXT "You need to reboot to finish the install of:",
+ IDC_STATIC,120,32,195,19
+ LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174,
+ 179,11
+ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12
+END
+
+IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Hardwareinstallation"
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/En.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/newdev/En.rc?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/En.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/En.rc Sat Jul 15 02:48:31 2006
@@ -1,6 +1,6 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Device installation"
@@ -8,16 +8,17 @@
BEGIN
LTEXT "Welcome",IDC_WELCOMETITLE,120,8,195,24
LTEXT "This wizard installs a new device driver for:",
- IDC_STATIC,120,40,195,16
+ IDC_STATIC,120,21,195,16
LTEXT "Click Next to continue.",IDC_STATIC,120,169,195,17
- LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11
+ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,36,164,11
+ LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16
CONTROL "Install driver automatically",IDC_RADIO_AUTO,"Button",
BS_AUTORADIOBUTTON,120,112,178,13
CONTROL "Install driver from specific location",IDC_RADIO_MANUAL,
"Button",BS_AUTORADIOBUTTON,120,133,164,14
END
-IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Device installation"
@@ -32,7 +33,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11
END
-IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Device installation"
@@ -44,7 +45,7 @@
LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11
END
-IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Device installation"
FONT 8, "MS Shell Dlg"
@@ -62,7 +63,7 @@
WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL
END
-IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Device installation"
FONT 8, "MS Shell Dlg"
@@ -70,7 +71,7 @@
LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16
END
-IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Device installation"
FONT 8, "MS Shell Dlg"
@@ -78,7 +79,21 @@
LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16
END
-IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Device installation"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11
+ LTEXT "You need to reboot to finish the install of:",
+ IDC_STATIC,120,32,195,19
+ LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174,
+ 179,11
+ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12
+END
+
+IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Device installation"
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Es.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Es.rc?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Es.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Es.rc Sat Jul 15 02:48:31 2006
@@ -1,6 +1,6 @@
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Instalación de Dispositivos"
@@ -8,16 +8,17 @@
BEGIN
LTEXT "Bienvenido",IDC_WELCOMETITLE,120,8,195,24
LTEXT "Este asistente lo ayudará a instalar un nuevo controlador de dispositivos para:",
- IDC_STATIC,120,40,195,16
+ IDC_STATIC,120,21,195,16
LTEXT "Haga click en Siguiente para continuar.",IDC_STATIC,120,169,195,17
- LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,134,55,164,11
+ LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,134,36,164,11
+ LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16
CONTROL "Instalar controlador automáticamente",IDC_RADIO_AUTO,"Button",
BS_AUTORADIOBUTTON,120,112,178,13
CONTROL "Instalar controlador desde una ubicación específica",IDC_RADIO_MANUAL,
"Button",BS_AUTORADIOBUTTON,120,133,164,14
END
-IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Instalación de Dispositivos"
@@ -32,7 +33,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11
END
-IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Device installation"
@@ -44,7 +45,7 @@
LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11
END
-IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Instalación de Dispositivos"
FONT 8, "MS Shell Dlg"
@@ -62,7 +63,7 @@
WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL
END
-IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Device installation"
FONT 8, "MS Shell Dlg"
@@ -70,7 +71,7 @@
LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,51,20,169,16
END
-IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Device installation"
FONT 8, "MS Shell Dlg"
@@ -78,7 +79,21 @@
LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,51,20,169,16
END
-IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Device installation"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11
+ LTEXT "You need to reboot to finish the install of:",
+ IDC_STATIC,120,32,195,19
+ LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174,
+ 179,11
+ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12
+END
+
+IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Device installation"
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc Sat Jul 15 02:48:31 2006
@@ -1,38 +1,39 @@
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Installation de matériel"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Bienvenue",IDC_WELCOMETITLE,115,8,195,24
- LTEXT "Cet assistant installe un nouveau pilote pour:",
- IDC_STATIC,115,40,195,16
+ LTEXT "Cet assistant installe un nouveau pilote pour :",
+ IDC_STATIC,115,21,195,16
LTEXT "Cliquer sur Suivant pour continuer.",IDC_STATIC,115,169,195,17
- LTEXT "UNKNOWN DEVICE",IDC_DEVICE,129,55,164,11
+ LTEXT "MATERIEL INCONNU",IDC_DEVICE,129,36,164,11
+ LTEXT "ATTENTION ! L'INSTALLATION D'UN PILOTE PEUT ENTRAINER LE BLOCAGE DE VOTRE ORDINATEUR OU LE RENDRE INDEMARRABLE !",IDC_STATIC,105,59,210,16
CONTROL "Installer le pilote automatiquement",IDC_RADIO_AUTO,"Button",
BS_AUTORADIOBUTTON,115,112,178,13
CONTROL "Installer le pilote depuis un endroit spécifié",IDC_RADIO_MANUAL,
"Button",BS_AUTORADIOBUTTON,115,133,164,14
END
-IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Installation de matériel"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "L'installation a échoué",IDC_FINISHTITLE,115,8,195,24
- LTEXT "Le périphérique n'a pu être installé car le pilote est introuvable.",
+ LTEXT "Le périphérique n'a pu être installé car aucun pilote adapté n'a pu être trouvé.",
IDC_STATIC,115,40,195,19
- LTEXT "Clicquer sur Précédent si vous avez un disque pilote ou vous connaissez le chemin du pilote.",
+ LTEXT "Cliquer sur Précédent si vous avez un disque pilote ou vous connaissez le chemin du pilote.",
IDC_STATIC,113,98,181,24
CONTROL "Ne plus afficher ce message",IDC_DONOTSHOWDLG,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,114,170,180,11
END
-IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Installation de matériel"
@@ -44,7 +45,7 @@
LTEXT "Matériel inconnu",IDC_DEVICE,134,55,164,11
END
-IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Installation de matériel"
FONT 8, "MS Shell Dlg"
@@ -62,30 +63,44 @@
WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL
END
-IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Installation de matériel"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Matériel Inconnu",IDC_DEVICE,51,20,169,16
+ LTEXT "MATERIEL INCONNU",IDC_DEVICE,51,20,169,16
END
-IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Installation de matériel"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Matériel Inconnu",IDC_DEVICE,51,20,169,16
+ LTEXT "MATERIEL INCONNU",IDC_DEVICE,51,20,169,16
END
-IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Device installation"
FONT 8, "MS Shell Dlg"
BEGIN
+ LTEXT "Installation terminée",IDC_FINISHTITLE,120,8,195,11
+ LTEXT "Vous devez redémarrer l'ordinateur avant d'utiliser :",
+ IDC_STATIC,120,32,195,19
+ LTEXT "Cliquer sur Terminer pour fermer l'assistant.",IDC_STATIC,120,174,
+ 179,11
+ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12
+END
+
+IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Installation de matériel"
+FONT 8, "MS Shell Dlg"
+BEGIN
LTEXT "Installation terminée",IDC_FINISHTITLE,115,8,195,11
- LTEXT "L'assistant a fini d'installer le pilote pour:",
+ LTEXT "L'assistant a fini d'installer le pilote pour :",
IDC_STATIC,115,32,195,19
LTEXT "Cliquer sur Terminer pour fermer l'assistant.",IDC_STATIC,115,174,
179,11
Propchange: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Fr.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc Sat Jul 15 02:48:31 2006
@@ -1,95 +1,110 @@
-// Hungarian resource file by Robert Horvath - talley at cubeclub.hu
-LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
-
-IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
- WS_SYSMENU
-CAPTION "Hardver telepítõ"
-FONT 8, "MS Shell Dlg"
-BEGIN
- LTEXT "welcome??",IDC_WELCOMETITLE,115,8,195,24
- LTEXT "A telepítõ a következõ hardverhez telepít fel eszközmeghatjtót:",
- IDC_STATIC,120,40,195,16
- LTEXT "Kattints a Tovább gombra a folytatáshoz.",IDC_STATIC,115,169,195,17
- LTEXT "Ismeretlen eszköz!",IDC_DEVICE,129,55,164,11
- CONTROL "Automatikus telepítés",IDC_RADIO_AUTO,"Button",
- BS_AUTORADIOBUTTON,120,112,178,13
- CONTROL "Eszközmeghajtó kiválasztása",IDC_RADIO_MANUAL,
- "Button",BS_AUTORADIOBUTTON,120,133,164,14
-END
-
-IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
- WS_SYSMENU
-CAPTION "Hardver telepítõ"
-FONT 8, "MS Shell Dlg"
-BEGIN
- LTEXT "A telepítés sikertelen.",IDC_FINISHTITLE,115,8,195,24
- LTEXT "Az eszközmeghajtó nem található.",
- IDC_STATIC,120,40,195,19
- LTEXT "Kattints a Vissza gombra, és az Eszközmeghajtó kiválasztása gombra, ha tudod, hol van az eszközmeghajtó.",
- IDC_STATIC,120,98,181,24
- CONTROL "Ne mutasd ezt többször",IDC_DONOTSHOWDLG,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11
-END
-
-IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
- WS_SYSMENU
-CAPTION "Device installation"
-FONT 8, "MS Shell Dlg"
-BEGIN
- LTEXT "Installation failed",IDC_FINISHTITLE,120,8,195,24
- LTEXT "The device could not be installed because an unexpected error happened.",
- IDC_STATIC,120,40,195,19
- LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11
-END
-
-IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Hardver telepítõ"
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Keresés ezeken a helyeken",IDC_RADIO_SEARCHHERE,"Button",
- BS_AUTORADIOBUTTON,27,11,239,13
- CONTROL "Eszközmeghajtó kiválasztása",IDC_RADIO_CHOOSE,"Button",
- BS_AUTORADIOBUTTON,27,98,171,12
- CONTROL "Keresés cserélhetõ lemezeken",IDC_CHECK_MEDIA,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9
- CONTROL "A következõ útvonalon keressen",IDC_CHECK_PATH,"Button",
- WS_TABSTOP,47,54,162,10
- PUSHBUTTON "Böngészés",IDC_BROWSE,248,69,45,14
- COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT |
- WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL
-END
-
-IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Hardver telepítõ"
-FONT 8, "MS Shell Dlg"
-BEGIN
- LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16
-END
-
-IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Hardver telepítõ"
-FONT 8, "MS Shell Dlg"
-BEGIN
- LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16
-END
-
-IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
- WS_SYSMENU
-CAPTION "Hardver telepítõ"
-FONT 8, "MS Shell Dlg"
-BEGIN
- LTEXT "A telepítés sikeresen befejezõdött",IDC_FINISHTITLE,120,8,195,11
- LTEXT "A telepítõ feltelepítette az eszközmeghajtókat a következõ eszközhöz:",
- IDC_STATIC,120,32,195,19
- LTEXT "A kilépéshez kattints a Befejezés gombra.",IDC_STATIC,120,174,
- 179,11
- LTEXT "Ismeretlen eszköz!",IDC_DEVICE,148,53,147,12
-END
-
+// Hungarian resource file by Robert Horvath - talley at cubeclub.hu
+LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
+
+IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Hardver telepítõ"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "welcome??",IDC_WELCOMETITLE,115,8,195,24
+ LTEXT "A telepítõ a következõ hardverhez telepít fel eszközmeghatjtót:",
+ IDC_STATIC,120,21,195,16
+ LTEXT "Kattints a Tovább gombra a folytatáshoz.",IDC_STATIC,115,169,195,17
+ LTEXT "Ismeretlen eszköz!",IDC_DEVICE,129,36,164,11
+ LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16
+ CONTROL "Automatikus telepítés",IDC_RADIO_AUTO,"Button",
+ BS_AUTORADIOBUTTON,120,112,178,13
+ CONTROL "Eszközmeghajtó kiválasztása",IDC_RADIO_MANUAL,
+ "Button",BS_AUTORADIOBUTTON,120,133,164,14
+END
+
+IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Hardver telepítõ"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "A telepítés sikertelen.",IDC_FINISHTITLE,115,8,195,24
+ LTEXT "Az eszközmeghajtó nem található.",
+ IDC_STATIC,120,40,195,19
+ LTEXT "Kattints a Vissza gombra, és az Eszközmeghajtó kiválasztása gombra, ha tudod, hol van az eszközmeghajtó.",
+ IDC_STATIC,120,98,181,24
+ CONTROL "Ne mutasd ezt többször",IDC_DONOTSHOWDLG,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11
+END
+
+IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Device installation"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Installation failed",IDC_FINISHTITLE,120,8,195,24
+ LTEXT "The device could not be installed because an unexpected error happened.",
+ IDC_STATIC,120,40,195,19
+ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11
+END
+
+IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Hardver telepítõ"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "Keresés ezeken a helyeken",IDC_RADIO_SEARCHHERE,"Button",
+ BS_AUTORADIOBUTTON,27,11,239,13
+ CONTROL "Eszközmeghajtó kiválasztása",IDC_RADIO_CHOOSE,"Button",
+ BS_AUTORADIOBUTTON,27,98,171,12
+ CONTROL "Keresés cserélhetõ lemezeken",IDC_CHECK_MEDIA,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9
+ CONTROL "A következõ útvonalon keressen",IDC_CHECK_PATH,"Button",
+ WS_TABSTOP,47,54,162,10
+ PUSHBUTTON "Böngészés",IDC_BROWSE,248,69,45,14
+ COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT |
+ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL
+END
+
+IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Hardver telepítõ"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16
+END
+
+IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Hardver telepítõ"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16
+END
+
+IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Device installation"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11
+ LTEXT "You need to reboot to finish the install of:",
+ IDC_STATIC,120,32,195,19
+ LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174,
+ 179,11
+ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12
+END
+
+IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Hardver telepítõ"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "A telepítés sikeresen befejezõdött",IDC_FINISHTITLE,120,8,195,11
+ LTEXT "A telepítõ feltelepítette az eszközmeghajtókat a következõ eszközhöz:",
+ IDC_STATIC,120,32,195,19
+ LTEXT "A kilépéshez kattints a Befejezés gombra.",IDC_STATIC,120,174,
+ 179,11
+ LTEXT "Ismeretlen eszköz!",IDC_DEVICE,148,53,147,12
+END
+
Propchange: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Hu.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Ru.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Ru.rc?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Ru.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/Ru.rc Sat Jul 15 02:48:31 2006
@@ -1,6 +1,6 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ"
@@ -8,16 +8,17 @@
BEGIN
LTEXT "Âàñ ïðèâåòñòâóåò ìàñòåð óñòàíîâêè íîâîãî îáîðóäîâàíèÿ",IDC_WELCOMETITLE,120,8,195,24
LTEXT "Ýòîò ìàñòåð óñòàíàâëèâàåò äðàéâåð äëÿ:",
- IDC_STATIC,120,40,195,16
+ IDC_STATIC,120,21,195,16
LTEXT "Äëÿ ïðîäîëæåíèÿ íàæìèòå êíîïêó ""Äàëåå"".",IDC_STATIC,120,169,195,17
- LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,134,55,164,11
+ LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,134,36,164,11
+ LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16
CONTROL "Óñòàíîâèòü äðàéâåð àâòîìàòè÷åñêè",IDC_RADIO_AUTO,"Button",
BS_AUTORADIOBUTTON,120,112,178,13
CONTROL "Óñòàíîâèòü äðàéâåð èç óêàçàííîãî ìåñòà",IDC_RADIO_MANUAL,
"Button",BS_AUTORADIOBUTTON,120,133,164,14
END
-IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ"
@@ -32,7 +33,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11
END
-IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Device installation"
@@ -44,7 +45,7 @@
LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11
END
-IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ"
FONT 8, "MS Shell Dlg"
@@ -62,7 +63,7 @@
WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL
END
-IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ"
FONT 8, "MS Shell Dlg"
@@ -70,7 +71,7 @@
LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,51,20,169,16
END
-IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143
+IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ"
FONT 8, "MS Shell Dlg"
@@ -78,7 +79,21 @@
LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,51,20,169,16
END
-IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193
+IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193
+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Device installation"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11
+ LTEXT "You need to reboot to finish the install of:",
+ IDC_STATIC,120,32,195,19
+ LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174,
+ 179,11
+ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12
+END
+
+IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ"
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/newdev.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/newdev/newdev.c?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/newdev.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/newdev.c Sat Jul 15 02:48:31 2006
@@ -325,22 +325,16 @@
return TRUE;
}
-static LPTSTR
+static LPCTSTR
GetFileExt(IN LPTSTR FileName)
{
- if (FileName == 0)
+ LPCTSTR Dot;
+
+ Dot = _tcsrchr(FileName, _T('.'));
+ if (!Dot)
return _T("");
- int i = _tcsclen(FileName);
- while ((i >= 0) && (FileName[i] != _T('.')))
- i--;
-
- FileName = _tcslwr(FileName);
-
- if (i >= 0)
- return &FileName[i];
- else
- return _T("");
+ return Dot;
}
static BOOL
@@ -390,7 +384,7 @@
{
LPCTSTR pszExtension = GetFileExt(FileName);
- if ((_tcscmp(pszExtension, _T(".inf")) == 0) && (_tcscmp(LastDirPath, DirPath) != 0))
+ if ((_tcsicmp(pszExtension, _T(".inf")) == 0) && (_tcscmp(LastDirPath, DirPath) != 0))
{
_tcscpy(LastDirPath, DirPath);
@@ -462,9 +456,6 @@
DWORD CustomTextLength = 0;
DWORD LengthNeeded = 0;
LPTSTR Buffer;
-
- TRACE("Include removable devices: %s\n", IncludeRemovableDevices ? "yes" : "no");
- TRACE("Include custom path : %s\n", IncludeCustomPath ? "yes" : "no");
/* Calculate length needed to store the search paths */
if (IncludeRemovableDevices)
@@ -754,6 +745,20 @@
{
/* Driver found ; install it */
retval = InstallCurrentDriver(DevInstData);
+ if (retval && Show != SW_HIDE)
+ {
+ /* Should we display the 'Need to reboot' page? */
+ SP_DEVINSTALL_PARAMS installParams;
+ installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
+ if (SetupDiGetDeviceInstallParams(
+ DevInstData->hDevInfo,
+ &DevInstData->devInfoData,
+ &installParams))
+ {
+ if (installParams.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT))
+ retval = DisplayWizard(DevInstData, hWndParent, IDD_NEEDREBOOT);
+ }
+ }
goto cleanup;
}
else if (Show == SW_HIDE)
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/resource.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/newdev/resource.h?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/resource.h (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/resource.h Sat Jul 15 02:48:31 2006
@@ -25,6 +25,8 @@
#define IDD_INSTALLDRV 3
#define IDD_NODRIVER 4
#define IDD_INSTALLFAILED 5
-#define IDD_FINISHPAGE 6
+#define IDD_NEEDREBOOT 6
+#define IDD_FINISHPAGE 7
+#define IDD_MAXIMUMPAGE IDD_FINISHPAGE
#endif /* RESOURCE_H */
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/newdev/wizard.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/newdev/wizard.c?rev=23064&r1=23063&r2=23064&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/newdev/wizard.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/newdev/wizard.c Sat Jul 15 02:48:31 2006
@@ -421,6 +421,7 @@
IN LPARAM lParam)
{
PDEVINSTDATA DevInstData;
+ UNREFERENCED_PARAMETER(wParam);
/* Retrieve pointer to the global setup data */
DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
@@ -501,7 +502,7 @@
break;
}
- return FALSE;
+ return DefWindowProc(hwndDlg, uMsg, wParam, lParam);
}
static void
@@ -663,7 +664,7 @@
break;
}
- return FALSE;
+ return DefWindowProc(hwndDlg, uMsg, wParam, lParam);
}
static INT_PTR CALLBACK
@@ -758,7 +759,7 @@
break;
}
- return FALSE;
+ return DefWindowProc(hwndDlg, uMsg, wParam, lParam);
}
static INT_PTR CALLBACK
@@ -809,9 +810,25 @@
CloseHandle(hThread);
hThread = 0;
if (wParam == 0)
- PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_FINISHPAGE);
- else
- PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED);
+ {
+ /* Should we reboot? */
+ SP_DEVINSTALL_PARAMS installParams;
+ installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
+ if (SetupDiGetDeviceInstallParams(
+ DevInstData->hDevInfo,
+ &DevInstData->devInfoData,
+ &installParams))
+ {
+ if (installParams.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT))
+ {
+ PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_NEEDREBOOT);
+ }
+ else
+ PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_FINISHPAGE);
+ break;
+ }
+ }
+ PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED);
break;
}
@@ -848,7 +865,7 @@
break;
}
- return FALSE;
+ return DefWindowProc(hwndDlg, uMsg, wParam, lParam);
}
static INT_PTR CALLBACK
@@ -861,6 +878,8 @@
PDEVINSTDATA DevInstData;
HWND hwndControl;
+ UNREFERENCED_PARAMETER(wParam);
+
/* Get pointer to the global setup data */
DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
@@ -870,8 +889,12 @@
{
BOOL DisableableDevice = FALSE;
+ /* Get pointer to the global setup data */
DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam;
SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData);
+
+ /* Center the wizard window */
+ CenterWindow(GetParent(hwndDlg));
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
ShowWindow(hwndControl, SW_HIDE);
@@ -957,7 +980,7 @@
break;
}
- return FALSE;
+ return DefWindowProc(hwndDlg, uMsg, wParam, lParam);
}
static INT_PTR CALLBACK
@@ -968,6 +991,7 @@
IN LPARAM lParam)
{
PDEVINSTDATA DevInstData;
+ UNREFERENCED_PARAMETER(wParam);
/* Retrieve pointer to the global setup data */
DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
@@ -981,6 +1005,9 @@
/* Get pointer to the global setup data */
DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam;
SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData);
+
+ /* Center the wizard window */
+ CenterWindow(GetParent(hwndDlg));
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
ShowWindow(hwndControl, SW_HIDE);
@@ -1032,17 +1059,18 @@
break;
}
- return FALSE;
+ return DefWindowProc(hwndDlg, uMsg, wParam, lParam);
}
static INT_PTR CALLBACK
-FinishDlgProc(
+NeedRebootDlgProc(
IN HWND hwndDlg,
IN UINT uMsg,
IN WPARAM wParam,
IN LPARAM lParam)
{
PDEVINSTDATA DevInstData;
+ UNREFERENCED_PARAMETER(wParam);
/* Retrieve pointer to the global setup data */
DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
@@ -1056,6 +1084,9 @@
/* Get pointer to the global setup data */
DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam;
SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData);
+
+ /* Center the wizard window */
+ CenterWindow(GetParent(hwndDlg));
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
ShowWindow(hwndControl, SW_HIDE);
@@ -1107,7 +1138,86 @@
break;
}
- return FALSE;
+ return DefWindowProc(hwndDlg, uMsg, wParam, lParam);
+}
+
+static INT_PTR CALLBACK
+FinishDlgProc(
+ IN HWND hwndDlg,
+ IN UINT uMsg,
+ IN WPARAM wParam,
+ IN LPARAM lParam)
+{
+ PDEVINSTDATA DevInstData;
+ UNREFERENCED_PARAMETER(wParam);
+
+ /* Retrieve pointer to the global setup data */
+ DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
+
+ switch (uMsg)
+ {
+ case WM_INITDIALOG:
+ {
+ HWND hwndControl;
+
+ /* Get pointer to the global setup data */
+ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData);
+
+ /* Center the wizard window */
+ CenterWindow(GetParent(hwndDlg));
+
+ hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
+ ShowWindow(hwndControl, SW_HIDE);
+ EnableWindow(hwndControl, FALSE);
+
+ SendDlgItemMessage(
+ hwndDlg,
+ IDC_DEVICE,
+ WM_SETTEXT,
+ 0,
+ (LPARAM)DevInstData->drvInfoData.Description);
+
+ /* Set title font */
+ SendDlgItemMessage(
+ hwndDlg,
+ IDC_FINISHTITLE,
+ WM_SETFONT,
+ (WPARAM)DevInstData->hTitleFont,
+ (LPARAM)TRUE);
+ break;
+ }
+
+ case WM_NOTIFY:
+ {
+ LPNMHDR lpnm = (LPNMHDR)lParam;
+
+ switch (lpnm->code)
+ {
+ case PSN_SETACTIVE:
+ /* Enable the correct buttons on for the active page */
+ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH);
+ break;
+
+ case PSN_WIZBACK:
+ /* Handle a Back button click, if necessary */
+ break;
+
+ case PSN_WIZFINISH:
+ /* Handle a Finish button click, if necessary */
+ break;
+
+ default:
+ break;
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ return DefWindowProc(hwndDlg, uMsg, wParam, lParam);
}
static HFONT
@@ -1142,7 +1252,7 @@
IN UINT startPage)
{
PROPSHEETHEADER psh;
- HPROPSHEETPAGE ahpsp[IDD_FINISHPAGE + 1];
+ HPROPSHEETPAGE ahpsp[IDD_MAXIMUMPAGE + 1];
PROPSHEETPAGE psp;
/* Create the Welcome page */
@@ -1151,43 +1261,49 @@
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
psp.hInstance = hDllInstance;
psp.lParam = (LPARAM)DevInstData;
- psp.pfnDlgProc = WelcomeDlgProc;
+ psp.pfnDlgProc = (DLGPROC) WelcomeDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE);
ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp);
/* Create the Select Source page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
- psp.pfnDlgProc = CHSourceDlgProc;
+ psp.pfnDlgProc = (DLGPROC) CHSourceDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE);
ahpsp[IDD_CHSOURCE] = CreatePropertySheetPage(&psp);
/* Create the Search driver page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
- psp.pfnDlgProc = SearchDrvDlgProc;
+ psp.pfnDlgProc = (DLGPROC) SearchDrvDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV);
ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp);
/* Create the Install driver page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
- psp.pfnDlgProc = InstallDrvDlgProc;
+ psp.pfnDlgProc = (DLGPROC) InstallDrvDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV);
ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp);
/* Create the No driver page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
- psp.pfnDlgProc = NoDriverDlgProc;
+ psp.pfnDlgProc = (DLGPROC) NoDriverDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER);
ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp);
/* Create the Install failed page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
- psp.pfnDlgProc = InstallFailedDlgProc;
+ psp.pfnDlgProc = (DLGPROC) InstallFailedDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED);
ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp);
+ /* Create the Need reboot page */
+ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
+ psp.pfnDlgProc = (DLGPROC) NeedRebootDlgProc;
+ psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT);
+ ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp);
+
/* Create the Finish page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
- psp.pfnDlgProc = FinishDlgProc;
+ psp.pfnDlgProc = (DLGPROC) FinishDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE);
ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp);
@@ -1196,7 +1312,7 @@
psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER;
psh.hInstance = hDllInstance;
psh.hwndParent = hwndParent;
- psh.nPages = IDD_FINISHPAGE + 1;
+ psh.nPages = IDD_MAXIMUMPAGE + 1;
psh.nStartPage = startPage;
psh.phpage = ahpsp;
psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);
More information about the Ros-diffs
mailing list