- Move new hardware wizard code to wizard.c

- Disable non working buttons
- Improve navigation between pages
- Prepare room for an install page

svn path=/trunk/; revision=22049
This commit is contained in:
Hervé Poussineau 2006-05-25 22:55:13 +00:00
parent 8dd3dc564a
commit dd411b3aa0
9 changed files with 200 additions and 849 deletions

View file

@ -58,6 +58,14 @@ BEGIN
LTEXT "UNKNOWN DEVICE",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 "Hardwareinstallation"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "UNKNOWN DEVICE",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

View file

@ -58,6 +58,14 @@ BEGIN
LTEXT "UNKNOWN DEVICE",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 "Device installation"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "UNKNOWN DEVICE",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

View file

@ -58,6 +58,14 @@ BEGIN
LTEXT "DISPOSITIVO DESCONOCIDO",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 "Device installation"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "DISPOSITIVO DESCONOCIDO",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

View file

@ -48,6 +48,14 @@ 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

View file

@ -17,7 +17,7 @@ BEGIN
"Button",BS_AUTORADIOBUTTON,120,133,164,14
END
IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193
IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ"
@ -58,6 +58,14 @@ BEGIN
LTEXT "Íåèçâåñòíîå óñòðîéñòâî",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 "Óñòàíîâêà îáîðóäîâàíèÿ"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Íåèçâåñòíîå óñòðîéñòâî",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

File diff suppressed because it is too large Load diff

View file

@ -10,6 +10,8 @@
#include "resource.h"
extern HINSTANCE hDllInstance;
typedef struct _DEVINSTDATA
{
HFONT hTitleFont;
@ -20,6 +22,31 @@ typedef struct _DEVINSTDATA
HDEVINFO hDevInfo;
SP_DEVINFO_DATA devInfoData;
SP_DRVINFO_DATA drvInfoData;
LPTSTR CustomSearchPath; /* MULTI_SZ string */
} DEVINSTDATA, *PDEVINSTDATA;
#define WM_SEARCH_FINISHED (WM_USER + 10)
/* newdev.c */
BOOL
SearchDriver(
IN PDEVINSTDATA DevInstData,
IN LPCTSTR Directory OPTIONAL,
IN LPCTSTR InfFile OPTIONAL);
BOOL
SearchDriverRecursive(
IN PDEVINSTDATA DevInstData,
IN LPCTSTR Path);
BOOL
InstallCurrentDriver(
IN PDEVINSTDATA DevInstData);
/* wizard.c */
BOOL
DisplayWizard(
IN PDEVINSTDATA DevInstData,
IN HWND hwndParent,
IN UINT startPage);

View file

@ -7,6 +7,7 @@
<define name="_WIN32_WINNT">0x0501</define>
<file>newdev.c</file>
<file>stubs.c</file>
<file>wizard.c</file>
<file>newdev.rc</file>
<file>newdev.spec</file>
<library>wine</library>

View file

@ -1,10 +1,10 @@
#ifndef RESOURCE_H
#define RESOURCE_H
#define IDB_WATERMARK 100
#define IDB_HEADER 101
#define IDB_WATERMARK 100
#define IDB_HEADER 101
#define IDC_STATIC -1
#define IDC_STATIC -1
#define IDC_DEVICE 2000
#define IDC_RADIO_AUTO 2001
@ -14,15 +14,16 @@
#define IDC_RADIO_CHOOSE 2005
#define IDC_CHECK_MEDIA 2006
#define IDC_CHECK_PATH 2007
#define IDC_WELCOMETITLE 2008
#define IDC_WELCOMETITLE 2008
#define IDC_BROWSE 2009
#define IDC_COMBO_PATH 2010
#define IDC_FINISHTITLE 2011
#define IDD_WELCOMEPAGE 0
#define IDD_WELCOMEPAGE 0
#define IDD_CHSOURCE 1
#define IDD_SEARCHDRV 2
#define IDD_FINISHPAGE 3
#define IDD_INSTALLDRV 3
#define IDD_NODRIVER 4
#define IDD_FINISHPAGE 5
#endif /* RESOURCE_H */