[ros-diffs] [ekohl] 64558: [NEWDEV] - Implement InstallDevInst. - Display different wizard titles for the instller and update wizard. - Add header titles to the wizard pages. - Add new header file for private ...

Author: ekohl
Date: Mon Oct  6 14:23:36 2014
New Revision: 64558

URL: http://svn.reactos.org/svn/reactos?rev=64558&view=rev
Log:
[NEWDEV]
- Implement InstallDevInst.
- Display different wizard titles for the instller and update wizard.
- Add header titles to the wizard pages.
- Add new header file for private functions.

Added:
    trunk/reactos/include/reactos/dll/newdevp.h   (with props)
Modified:
    trunk/reactos/dll/win32/newdev/lang/bg-BG.rc
    trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc
    trunk/reactos/dll/win32/newdev/lang/de-DE.rc
    trunk/reactos/dll/win32/newdev/lang/el-GR.rc
    trunk/reactos/dll/win32/newdev/lang/en-US.rc
    trunk/reactos/dll/win32/newdev/lang/es-ES.rc
    trunk/reactos/dll/win32/newdev/lang/fr-FR.rc
    trunk/reactos/dll/win32/newdev/lang/he-IL.rc
    trunk/reactos/dll/win32/newdev/lang/hu-HU.rc
    trunk/reactos/dll/win32/newdev/lang/id-ID.rc
    trunk/reactos/dll/win32/newdev/lang/it-IT.rc
    trunk/reactos/dll/win32/newdev/lang/ja-JP.rc
    trunk/reactos/dll/win32/newdev/lang/nl-NL.rc
    trunk/reactos/dll/win32/newdev/lang/no-NO.rc
    trunk/reactos/dll/win32/newdev/lang/pl-PL.rc
    trunk/reactos/dll/win32/newdev/lang/ro-RO.rc
    trunk/reactos/dll/win32/newdev/lang/ru-RU.rc
    trunk/reactos/dll/win32/newdev/lang/sk-SK.rc
    trunk/reactos/dll/win32/newdev/lang/sq-AL.rc
    trunk/reactos/dll/win32/newdev/lang/th-TH.rc
    trunk/reactos/dll/win32/newdev/lang/tr-TR.rc
    trunk/reactos/dll/win32/newdev/lang/uk-UA.rc
    trunk/reactos/dll/win32/newdev/newdev.c
    trunk/reactos/dll/win32/newdev/newdev.spec
    trunk/reactos/dll/win32/newdev/newdev_private.h
    trunk/reactos/dll/win32/newdev/resource.h
    trunk/reactos/dll/win32/newdev/wizard.c

Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/bg-B…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/bg-BG.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "Натиснете „Край“ за затваряне на
вълшебника.", IDC_STATIC, 120, 174, 179, 11
     LTEXT "НЕИЗВЕСТНО УСТРОЙСТВО", IDC_DEVICE, 148, 53,
147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/cs-C…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -90,3 +90,12 @@
     LTEXT "Kliknutím na Dokončit zavřete průvodce.", IDC_STATIC, 120, 174,
179, 11
     LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/de-DE.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "Klicken Sie zum Beenden der Installation auf Fertigstellen.",
IDC_STATIC, 120, 174, 190, 11
     LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/el-G…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/el-GR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/el-GR.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "Πατήστε 'Ολοκλήρωση' για να
κλείσετε το βοηθό.", IDC_STATIC, 120, 174, 179, 11
     LTEXT "ΑΓΝΩΣΤΗ ΣΥΣΚΕΥΗ", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/en-U…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/en-US.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "Click Finish to close the wizard.", IDC_STATIC, 120, 174, 179, 11
     LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/es-E…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/es-ES.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "Haga clic en Finalizar parar cerrar el asistente.", IDC_STATIC, 120,
174, 179, 11
     LTEXT "DISPOSITIVO DESCONOCIDO", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/fr-FR.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "Cliquer sur Terminer pour fermer l'assistant.", IDC_STATIC, 115,
174, 179, 11
     LTEXT "MATERIEL INCONNU", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/he-I…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/he-IL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/he-IL.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "לחץ סיום כדי לסגור את האשף.", IDC_STATIC, 120,
174, 179, 11
     LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/hu-H…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/hu-HU.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/hu-HU.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -87,3 +87,12 @@
     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
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/id-I…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/id-ID.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/id-ID.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "Klik Selesai untuk menutup bimbingan.", IDC_STATIC, 120, 174, 179,
11
     LTEXT "DEVICE TIDAK DIKENAL", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/it-I…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/it-IT.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -87,3 +87,12 @@
     LTEXT "Selezionare Fine per chiudere questa procedura guidata.",
IDC_STATIC, 120, 174, 179, 11
     LTEXT "DISPOSITIVO SCONOSCIUTO", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/ja-JP.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/ja-JP.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "[完了] をクリックするとウィザードを閉じます。",
IDC_STATIC, 120, 174, 179, 11
     LTEXT "不明なデバイス", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/nl-N…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/nl-NL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/nl-NL.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -92,3 +92,12 @@
     LTEXT "Klik op Voltooien om de wizard te sluiten.", IDC_STATIC, 120, 174,
179, 11
     LTEXT "ONBEKEND APPARAAT", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/no-N…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/no-NO.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -87,3 +87,12 @@
     LTEXT "Trykk Fullfør for å avslutte veiviseren.", IDC_STATIC, 120, 174,
179, 11
     LTEXT "UKJENT ENHET", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/pl-P…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/pl-PL.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -93,3 +93,12 @@
     LTEXT "Naciśnij Zakończ, aby zamknąć kreator.", IDC_STATIC, 120, 174, 179, 11
     LTEXT "NIEZNANE URZĄDZENIE", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/ro-RO.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -94,3 +94,12 @@
     LTEXT "Apăsați „Sfârșit” pentru a încheia instalarea.",
IDC_STATIC, 120, 174, 179, 11
     LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ru-R…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/ru-RU.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -85,3 +85,12 @@
     LTEXT "Нажмите ""Готово"" для
завершения мастера.", IDC_STATIC, 120, 174, 179, 11
     LTEXT "Неизвестное устройство", IDC_DEVICE, 148, 53,
147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sk-S…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/sk-SK.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -90,3 +90,12 @@
     LTEXT "Kliknutím na tlačidlo Dokončiť zavriete sprievodcu.",
IDC_STATIC, 120, 174, 179, 11
     LTEXT "NEZNÁME ZARIADENIE", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sq-A…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/sq-AL.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -89,3 +89,12 @@
     LTEXT "Kliko Mbaro për të mbyllur magjistar.", IDC_STATIC, 120, 174, 179,
11
     LTEXT "PAJISJE PANJOHUR", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/th-T…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/th-TH.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/th-TH.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -87,3 +87,12 @@
     LTEXT
"กดเลือกเสร็จสิ้นเพื่อปิดการติดตั้งอัตโนมัติ",
IDC_STATIC, 120, 174, 179, 11
     LTEXT "ไม่รู้จักอุปกรณ์", IDC_DEVICE, 148,
53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/tr-T…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/tr-TR.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -87,3 +87,12 @@
     LTEXT "Bu yardımcıyı kapatmak için Bitir'e tıklayınız.",
IDC_STATIC, 120, 174, 179, 11
     LTEXT "BÄ°LÄ°NMEYEN AYGIT", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/uk-U…
==============================================================================
--- trunk/reactos/dll/win32/newdev/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/lang/uk-UA.rc	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -93,3 +93,12 @@
     LTEXT "Натисніть ""Завершити"" для
виходу з майстра.", IDC_STATIC, 120, 174, 179, 11
     LTEXT "НЕВІДОМИЙ ПРИСТРІЙ", IDC_DEVICE, 148, 53, 147, 12
 END
+
+STRINGTABLE
+BEGIN
+    IDS_INSTALLWIZARDTITLE "New hardware wizard"
+    IDS_UPDATEWIZARDTITLE "Update driver wizard"
+    IDS_CHSOURCE_TITLE "Choose search and install options"
+    IDS_SEARCHDRV_TITLE "Searching..."
+    IDS_INSTALLDRV_TITLE "Installing..."
+END

Modified: trunk/reactos/dll/win32/newdev/newdev.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?…
==============================================================================
--- trunk/reactos/dll/win32/newdev/newdev.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/newdev.c	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -804,6 +804,118 @@
     return retval;
 }
 
+
+BOOL
+WINAPI
+InstallDevInst(
+    IN HWND hWndParent,
+    IN LPCWSTR InstanceId,
+    IN BOOL bUpdate,
+    OUT LPDWORD lpReboot)
+{
+    PDEVINSTDATA DevInstData = NULL;
+    BOOL ret;
+    BOOL retval = FALSE;
+
+    TRACE("InstllDevInst(%p, %s, %d, %p)\n", hWndParent,
debugstr_w(InstanceId), bUpdate, lpReboot);
+
+    DevInstData = HeapAlloc(GetProcessHeap(), 0, sizeof(DEVINSTDATA));
+    if (!DevInstData)
+    {
+        TRACE("HeapAlloc() failed\n");
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        goto cleanup;
+    }
+
+    /* Clear devinst data */
+    ZeroMemory(DevInstData, sizeof(DEVINSTDATA));
+    DevInstData->devInfoData.cbSize = 0; /* Tell if the devInfoData is valid */
+    DevInstData->bUpdate = bUpdate;
+
+    /* Fill devinst data */
+    DevInstData->hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL);
+    if (DevInstData->hDevInfo == INVALID_HANDLE_VALUE)
+    {
+        TRACE("SetupDiCreateDeviceInfoListExW() failed with error 0x%x\n",
GetLastError());
+        goto cleanup;
+    }
+
+    DevInstData->devInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
+    ret = SetupDiOpenDeviceInfoW(
+        DevInstData->hDevInfo,
+        InstanceId,
+        NULL,
+        0, /* Open flags */
+        &DevInstData->devInfoData);
+    if (!ret)
+    {
+        TRACE("SetupDiOpenDeviceInfoW() failed with error 0x%x (InstanceId
%s)\n",
+            GetLastError(), debugstr_w(InstanceId));
+        DevInstData->devInfoData.cbSize = 0;
+        goto cleanup;
+    }
+
+    SetLastError(ERROR_GEN_FAILURE);
+    ret = SetupDiGetDeviceRegistryProperty(
+        DevInstData->hDevInfo,
+        &DevInstData->devInfoData,
+        SPDRP_DEVICEDESC,
+        &DevInstData->regDataType,
+        NULL, 0,
+        &DevInstData->requiredSize);
+
+    if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER &&
DevInstData->regDataType == REG_SZ)
+    {
+        DevInstData->buffer = HeapAlloc(GetProcessHeap(), 0,
DevInstData->requiredSize);
+        if (!DevInstData->buffer)
+        {
+            TRACE("HeapAlloc() failed\n");
+            SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        }
+        else
+        {
+            ret = SetupDiGetDeviceRegistryPropertyW(
+                DevInstData->hDevInfo,
+                &DevInstData->devInfoData,
+                SPDRP_DEVICEDESC,
+                &DevInstData->regDataType,
+                DevInstData->buffer, DevInstData->requiredSize,
+                &DevInstData->requiredSize);
+        }
+    }
+
+    if (!ret)
+    {
+        TRACE("SetupDiGetDeviceRegistryProperty() failed with error 0x%x (InstanceId
%s)\n",
+            GetLastError(), debugstr_w(InstanceId));
+        goto cleanup;
+    }
+
+    /* Prepare the wizard, and display it */
+    TRACE("Need to show install wizard\n");
+    retval = DisplayWizard(DevInstData, hWndParent, IDD_WELCOMEPAGE);
+
+cleanup:
+    if (DevInstData)
+    {
+        if (DevInstData->devInfoData.cbSize != 0)
+        {
+            if (!SetupDiDestroyDriverInfoList(DevInstData->hDevInfo,
&DevInstData->devInfoData, SPDIT_COMPATDRIVER))
+                TRACE("SetupDiDestroyDriverInfoList() failed with error
0x%lx\n", GetLastError());
+        }
+        if (DevInstData->hDevInfo != INVALID_HANDLE_VALUE)
+        {
+            if (!SetupDiDestroyDeviceInfoList(DevInstData->hDevInfo))
+                TRACE("SetupDiDestroyDeviceInfoList() failed with error
0x%lx\n", GetLastError());
+        }
+        HeapFree(GetProcessHeap(), 0, DevInstData->buffer);
+        HeapFree(GetProcessHeap(), 0, DevInstData);
+    }
+
+    return retval;
+}
+
+
 /*
 * @implemented
 */

Modified: trunk/reactos/dll/win32/newdev/newdev.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.sp…
==============================================================================
--- trunk/reactos/dll/win32/newdev/newdev.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/newdev.spec	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -1,6 +1,6 @@
 @ stdcall ClientSideInstallW(ptr ptr wstr long)
 @ stdcall DevInstallW(ptr ptr wstr long)
-@ stub InstallDevInst
+@ stdcall InstallDevInst(ptr wstr long ptr)
 @ stub InstallDevInstEx
 @ stdcall InstallNewDevice(ptr ptr ptr)
 @ stub InstallSelectedDevice

Modified: trunk/reactos/dll/win32/newdev/newdev_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev_pr…
==============================================================================
--- trunk/reactos/dll/win32/newdev/newdev_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/newdev_private.h	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -17,6 +17,7 @@
 #include <windowsx.h>
 #include <newdev.h>
 #include <regstr.h>
+#include <dll/newdevp.h>
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(newdev);
@@ -28,6 +29,7 @@
 typedef struct _DEVINSTDATA
 {
 	HFONT hTitleFont;
+	BOOL bUpdate;
 	PBYTE buffer;
 	DWORD requiredSize;
 	DWORD regDataType;

Modified: trunk/reactos/dll/win32/newdev/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/resource.…
==============================================================================
--- trunk/reactos/dll/win32/newdev/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/resource.h	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -27,3 +27,9 @@
 #define IDD_NEEDREBOOT    6
 #define IDD_FINISHPAGE    7
 #define IDD_MAXIMUMPAGE   IDD_FINISHPAGE
+
+#define IDS_INSTALLWIZARDTITLE 1000
+#define IDS_UPDATEWIZARDTITLE  1001
+#define IDS_CHSOURCE_TITLE     1002
+#define IDS_SEARCHDRV_TITLE    1003
+#define IDS_INSTALLDRV_TITLE   1004

Modified: trunk/reactos/dll/win32/newdev/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?…
==============================================================================
--- trunk/reactos/dll/win32/newdev/wizard.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/wizard.c	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -1252,51 +1252,55 @@
     /* Create the Welcome page */
     ZeroMemory(&psp, sizeof(PROPSHEETPAGE));
     psp.dwSize = sizeof(PROPSHEETPAGE);
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.hInstance = hDllInstance;
     psp.lParam = (LPARAM)DevInstData;
+    psp.pszTitle = MAKEINTRESOURCE(DevInstData->bUpdate ? IDS_UPDATEWIZARDTITLE :
IDS_INSTALLWIZARDTITLE);
     psp.pfnDlgProc = 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.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE;
+    psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_CHSOURCE_TITLE);
     psp.pfnDlgProc = 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.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE;
+    psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SEARCHDRV_TITLE);
     psp.pfnDlgProc = 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.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE;
+    psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_INSTALLDRV_TITLE);
     psp.pfnDlgProc = InstallDrvDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV);
     ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp);
 
     /* Create the No driver page */
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.pfnDlgProc = NoDriverDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER);
     ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp);
 
     /* Create the Install failed page */
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.pfnDlgProc = InstallFailedDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED);
     ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp);
 
     /* Create the Need reboot page */
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.pfnDlgProc = NeedRebootDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT);
     ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp);
 
     /* Create the Finish page */
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.pfnDlgProc = FinishDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE);
     ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp);

Added: trunk/reactos/include/reactos/dll/newdevp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/newdev…
==============================================================================
--- trunk/reactos/include/reactos/dll/newdevp.h	(added)
+++ trunk/reactos/include/reactos/dll/newdevp.h	[iso-8859-1] Mon Oct  6 14:23:36 2014
@@ -0,0 +1,27 @@
+/*
+ * newdevp.h
+ *
+ * Private header for newdev.dll
+ *
+ */
+
+#ifndef __NEWDEVP__H
+#define __NEWDEVP__H
+
+BOOL
+WINAPI
+DevInstallW(
+    IN HWND hWndParent,
+    IN HINSTANCE hInstance,
+    IN LPCWSTR InstanceId,
+    IN INT Show);
+
+BOOL
+WINAPI
+InstallDevInst(
+    IN HWND hWndParent,
+    IN LPCWSTR InstanceId,
+    IN BOOL bUpdate,
+    OUT LPDWORD lpReboot);
+
+#endif /* __NEWDEVP__H */

Propchange: trunk/reactos/include/reactos/dll/newdevp.h
------------------------------------------------------------------------------
    svn:eol-style = native