[hpoussin] 22049: - Move new hardware wizard code to wizard.c - Disable non working buttons - Improve navigation between pages - Prepare room for an install page
25 May
2006
25 May
'06
10:55 p.m.
Author: hpoussin
Date: Fri May 26 02:55:13 2006
New Revision: 22049
URL: http://svn.reactos.ru/svn/reactos?rev=22049&view=rev
Log:
- Move new hardware wizard code to wizard.c
- Disable non working buttons
- Improve navigation between pages
- Prepare room for an install page
Modified:
trunk/reactos/dll/win32/newdev/De.rc
trunk/reactos/dll/win32/newdev/En.rc
trunk/reactos/dll/win32/newdev/Es.rc
trunk/reactos/dll/win32/newdev/Hu.rc
trunk/reactos/dll/win32/newdev/Ru.rc
trunk/reactos/dll/win32/newdev/newdev.c
trunk/reactos/dll/win32/newdev/newdev.h
trunk/reactos/dll/win32/newdev/newdev.rbuild
trunk/reactos/dll/win32/newdev/resource.h
Modified: trunk/reactos/dll/win32/newdev/De.rc
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/De.rc?rev=…
==============================================================================
--- trunk/reactos/dll/win32/newdev/De.rc (original)
+++ trunk/reactos/dll/win32/newdev/De.rc Fri May 26 02:55:13 2006
@@ -58,6 +58,14 @@
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
Modified: trunk/reactos/dll/win32/newdev/En.rc
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/En.rc?rev=…
==============================================================================
--- trunk/reactos/dll/win32/newdev/En.rc (original)
+++ trunk/reactos/dll/win32/newdev/En.rc Fri May 26 02:55:13 2006
@@ -58,6 +58,14 @@
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
Modified: trunk/reactos/dll/win32/newdev/Es.rc
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/Es.rc?rev=…
==============================================================================
--- trunk/reactos/dll/win32/newdev/Es.rc (original)
+++ trunk/reactos/dll/win32/newdev/Es.rc Fri May 26 02:55:13 2006
@@ -58,6 +58,14 @@
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
Modified: trunk/reactos/dll/win32/newdev/Hu.rc
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/Hu.rc?rev=…
==============================================================================
--- trunk/reactos/dll/win32/newdev/Hu.rc (original)
+++ trunk/reactos/dll/win32/newdev/Hu.rc Fri May 26 02:55:13 2006
@@ -48,6 +48,14 @@
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
Modified: trunk/reactos/dll/win32/newdev/Ru.rc
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/Ru.rc?rev=…
==============================================================================
--- trunk/reactos/dll/win32/newdev/Ru.rc (original)
+++ trunk/reactos/dll/win32/newdev/Ru.rc Fri May 26 02:55:13 2006
@@ -17,7 +17,7 @@
"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 @@
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
Modified: trunk/reactos/dll/win32/newdev/newdev.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?r…
==============================================================================
--- trunk/reactos/dll/win32/newdev/newdev.c (original)
+++ trunk/reactos/dll/win32/newdev/newdev.c Fri May 26 02:55:13 2006
@@ -24,143 +24,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(newdev);
-static BOOL SearchDriver ( PDEVINSTDATA DevInstData, LPCTSTR Path );
-static BOOL InstallDriver ( PDEVINSTDATA DevInstData );
-static DWORD WINAPI FindDriverProc( LPVOID lpParam );
-static BOOL FindDriver ( PDEVINSTDATA DevInstData, LPCWSTR InfFile );
-
-static DEVINSTDATA DevInstData;
+/* Global variables */
HINSTANCE hDllInstance;
-HANDLE hThread;
-
-static BOOL
-CanDisableDevice(
- IN DEVINST DevInst,
- IN HMACHINE hMachine,
- OUT BOOL *CanDisable)
-{
-#if 0
- /* hpoussin, Dec 2005. I've disabled this code because
- * ntoskrnl never sets the DN_DISABLEABLE flag.
- */
- CONFIGRET cr;
- ULONG Status, ProblemNumber;
- BOOL Ret = FALSE;
-
- cr = CM_Get_DevNode_Status_Ex(
- &Status,
- &ProblemNumber,
- DevInst,
- 0,
- hMachine);
- if (cr == CR_SUCCESS)
- {
- *CanDisable = ((Status & DN_DISABLEABLE) != 0);
- Ret = TRUE;
- }
-
- return Ret;
-#else
- *CanDisable = TRUE;
- return TRUE;
-#endif
-}
-
-
-static BOOL
-IsDeviceStarted(
- IN DEVINST DevInst,
- IN HMACHINE hMachine,
- OUT BOOL *IsEnabled)
-{
- CONFIGRET cr;
- ULONG Status, ProblemNumber;
- BOOL Ret = FALSE;
-
- cr = CM_Get_DevNode_Status_Ex(
- &Status,
- &ProblemNumber,
- DevInst,
- 0,
- hMachine);
- if (cr == CR_SUCCESS)
- {
- *IsEnabled = ((Status & DN_STARTED) != 0);
- Ret = TRUE;
- }
-
- return Ret;
-}
-
-
-static BOOL
-StartDevice(
- IN HDEVINFO DeviceInfoSet,
- IN PSP_DEVINFO_DATA DevInfoData OPTIONAL,
- IN BOOL bEnable,
- IN DWORD HardwareProfile OPTIONAL,
- OUT BOOL *bNeedReboot OPTIONAL)
-{
- SP_PROPCHANGE_PARAMS pcp;
- SP_DEVINSTALL_PARAMS dp;
- DWORD LastErr;
- BOOL Ret = FALSE;
-
- pcp.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
- pcp.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE;
- pcp.HwProfile = HardwareProfile;
-
- if (bEnable)
- {
- /* try to enable the device on the global profile */
- pcp.StateChange = DICS_ENABLE;
- pcp.Scope = DICS_FLAG_GLOBAL;
-
- /* ignore errors */
- LastErr = GetLastError();
- if (SetupDiSetClassInstallParams(
- DeviceInfoSet,
- DevInfoData,
- &pcp.ClassInstallHeader,
- sizeof(SP_PROPCHANGE_PARAMS)))
- {
- SetupDiCallClassInstaller(
- DIF_PROPERTYCHANGE,
- DeviceInfoSet,
- DevInfoData);
- }
- SetLastError(LastErr);
- }
-
- /* try config-specific */
- pcp.StateChange = (bEnable ? DICS_ENABLE : DICS_DISABLE);
- pcp.Scope = DICS_FLAG_CONFIGSPECIFIC;
-
- if (SetupDiSetClassInstallParams(
- DeviceInfoSet,
- DevInfoData,
- &pcp.ClassInstallHeader,
- sizeof(SP_PROPCHANGE_PARAMS)) &&
- SetupDiCallClassInstaller(DIF_PROPERTYCHANGE,
- DeviceInfoSet,
- DevInfoData))
- {
- dp.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
- if (SetupDiGetDeviceInstallParams(
- DeviceInfoSet,
- DevInfoData,
- &dp))
- {
- if (bNeedReboot != NULL)
- {
- *bNeedReboot = ((dp.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT)) != 0);
- }
-
- Ret = TRUE;
- }
- }
- return Ret;
-}
/*
* @implemented
@@ -293,17 +158,17 @@
TRACE("Trying to update the driver of %S\n", Buffer);
/* Search driver in the specified .inf file */
- if (!FindDriver(&DevInstData, FullInfPath))
- {
- TRACE("FindDriver() failed with error 0x%lx\n", GetLastError());
+ if (!SearchDriver(&DevInstData, NULL, FullInfPath))
+ {
+ TRACE("SearchDriver() failed with error 0x%lx\n", GetLastError());
continue;
}
/* FIXME: HACK! We shouldn't check of ERROR_PRIVILEGE_NOT_HELD */
- //if (!InstallDriver(&DevInstData))
- if (!InstallDriver(&DevInstData) && GetLastError() !=
ERROR_PRIVILEGE_NOT_HELD)
- {
- TRACE("InstallDriver() failed with error 0x%lx\n", GetLastError());
+ //if (!InstallCurrentDriver(&DevInstData))
+ if (!InstallCurrentDriver(&DevInstData) && GetLastError() !=
ERROR_PRIVILEGE_NOT_HELD)
+ {
+ TRACE("InstallCurrentDriver() failed with error 0x%lx\n", GetLastError());
continue;
}
@@ -375,552 +240,12 @@
return Result;
}
-
-static HFONT
-CreateTitleFont(VOID)
-{
- NONCLIENTMETRICS ncm;
- LOGFONT LogFont;
- HDC hdc;
- INT FontSize;
- HFONT hFont;
-
- ncm.cbSize = sizeof(NONCLIENTMETRICS);
- SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
-
- LogFont = ncm.lfMessageFont;
- LogFont.lfWeight = FW_BOLD;
- _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg"));
-
- hdc = GetDC(NULL);
- FontSize = 12;
- LogFont.lfHeight = 0 - GetDeviceCaps (hdc, LOGPIXELSY) * FontSize / 72;
- hFont = CreateFontIndirect(&LogFont);
- ReleaseDC(NULL, hdc);
-
- return hFont;
-}
-
-static VOID
-CenterWindow(
- IN HWND hWnd)
-{
- HWND hWndParent;
- RECT rcParent;
- RECT rcWindow;
-
- hWndParent = GetParent(hWnd);
- if (hWndParent == NULL)
- hWndParent = GetDesktopWindow();
-
- GetWindowRect(hWndParent, &rcParent);
- GetWindowRect(hWnd, &rcWindow);
-
- SetWindowPos(
- hWnd,
- HWND_TOP,
- ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) / 2,
- ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) / 2,
- 0,
- 0,
- SWP_NOSIZE);
-}
-
-static INT_PTR CALLBACK
-WelcomeDlgProc(
- IN HWND hwndDlg,
- IN UINT uMsg,
- IN WPARAM wParam,
- IN LPARAM lParam)
-{
-
- PDEVINSTDATA DevInstData;
-
- /* Retrieve pointer to the global setup data */
- DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
-
- switch (uMsg)
- {
- case WM_INITDIALOG:
- {
- HWND hwndControl;
- DWORD dwStyle;
-
- /* Get pointer to the global setup data */
- DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam;
- SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData);
-
- hwndControl = GetParent(hwndDlg);
-
- /* Center the wizard window */
- CenterWindow (hwndControl);
-
- /* Hide the system menu */
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
-
- /* Set title font */
- SendDlgItemMessage(
- hwndDlg,
- IDC_WELCOMETITLE,
- WM_SETFONT,
- (WPARAM)DevInstData->hTitleFont,
- (LPARAM)TRUE);
-
- SendDlgItemMessage(
- hwndDlg,
- IDC_DEVICE,
- WM_SETTEXT,
- 0,
- (LPARAM) DevInstData->buffer);
-
- SendDlgItemMessage(
- hwndDlg,
- IDC_RADIO_AUTO,
- BM_SETCHECK,
- (WPARAM) TRUE,
- (LPARAM) 0);
- break;
- }
-
- case WM_NOTIFY:
- {
- LPNMHDR lpnm = (LPNMHDR)lParam;
-
- switch (lpnm->code)
- {
- case PSN_SETACTIVE:
- /* Enable the Next button */
- PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
- break;
-
- case PSN_WIZNEXT:
- /* Handle a Next button click, if necessary */
- if (SendDlgItemMessage(hwndDlg, IDC_RADIO_AUTO, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0)
== BST_CHECKED)
- PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_SEARCHDRV);
- break;
-
- default:
- break;
- }
- break;
- }
-
- default:
- break;
- }
-
- return FALSE;
-}
-
-static INT_PTR CALLBACK
-CHSourceDlgProc(
- IN HWND hwndDlg,
- IN UINT uMsg,
- IN WPARAM wParam,
- IN LPARAM lParam)
-{
- PDEVINSTDATA DevInstData;
-
- /* Retrieve pointer to the global setup data */
- DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
-
- switch (uMsg)
- {
- case WM_INITDIALOG:
- {
- HWND hwndControl;
- DWORD dwStyle;
-
- /* Get pointer to the global setup data */
- DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam;
- SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData);
-
- hwndControl = GetParent(hwndDlg);
-
- /* Center the wizard window */
- CenterWindow (hwndControl);
-
- /* Hide the system menu */
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
-
- SendDlgItemMessage(
- hwndDlg,
- IDC_RADIO_SEARCHHERE,
- BM_SETCHECK,
- (WPARAM) TRUE,
- (LPARAM) 0);
-
- break;
- }
-
- case WM_NOTIFY:
- {
- LPNMHDR lpnm = (LPNMHDR)lParam;
-
- switch (lpnm->code)
- {
- case PSN_SETACTIVE:
- /* Enable the Next and Back buttons */
- PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
- break;
-
- case PSN_WIZNEXT:
- /* Handle a Next button click, if necessary */
- PropSheet_SetCurSel(GetParent(hwndDlg), 0, 4);
- break;
-
- default:
- break;
- }
- break;
- }
-
- default:
- break;
- }
-
- return FALSE;
-}
-
-static INT_PTR CALLBACK
-SearchDrvDlgProc(
- IN HWND hwndDlg,
- IN UINT uMsg,
- IN WPARAM wParam,
- IN LPARAM lParam)
-{
- PDEVINSTDATA DevInstData;
- DWORD dwThreadId;
-
- /* Retrieve pointer to the global setup data */
- DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
-
- switch (uMsg)
- {
- case WM_INITDIALOG:
- {
- HWND hwndControl;
- DWORD dwStyle;
-
- /* Get pointer to the global setup data */
- DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam;
- SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData);
-
- DevInstData->hDialog = hwndDlg;
- hwndControl = GetParent(hwndDlg);
-
- /* Center the wizard window */
- CenterWindow (hwndControl);
-
- SendDlgItemMessage(
- hwndDlg,
- IDC_DEVICE,
- WM_SETTEXT,
- 0,
- (LPARAM) DevInstData->buffer);
-
- /* Hide the system menu */
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
- break;
- }
-
- case WM_SEARCH_FINISHED:
- {
- CloseHandle(hThread);
- hThread = 0;
- if (wParam == 0)
- PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_NODRIVER);
- else
- PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_FINISHPAGE);
- break;
- }
-
- case WM_NOTIFY:
- {
- LPNMHDR lpnm = (LPNMHDR)lParam;
-
- switch (lpnm->code)
- {
- case PSN_SETACTIVE:
- PropSheet_SetWizButtons(GetParent(hwndDlg), !PSWIZB_NEXT | !PSWIZB_BACK);
- hThread = CreateThread( NULL, 0, FindDriverProc, DevInstData, 0, &dwThreadId);
- break;
-
- case PSN_KILLACTIVE:
- if (hThread != 0)
- {
- SetWindowLong ( hwndDlg, DWL_MSGRESULT, TRUE);
- return TRUE;
- }
- break;
-
- case PSN_WIZNEXT:
- /* Handle a Next button click, if necessary */
- break;
-
- default:
- break;
- }
- break;
- }
-
- default:
- break;
- }
-
- return FALSE;
-}
-
-static DWORD WINAPI
-FindDriverProc(
- IN LPVOID lpParam)
-{
- TCHAR drive[] = {'?',':',0};
- size_t nType;
- DWORD dwDrives;
- PDEVINSTDATA DevInstData;
- DWORD config_flags;
- UINT i = 1;
-
- DevInstData = (PDEVINSTDATA)lpParam;
-
- dwDrives = GetLogicalDrives();
- for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++)
- {
- if (dwDrives & i)
- {
- nType = GetDriveType( drive );
- if (nType == DRIVE_CDROM)
- {
- /* search for inf file */
- if (SearchDriver ( DevInstData, drive ))
- {
- /* if we found a valid driver inf... */
- if (FindDriver ( DevInstData, NULL ))
- {
- InstallDriver ( DevInstData );
- PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 1, 0);
- return 0;
- }
- }
- }
- }
- i <<= 1;
- }
-
- /* update device configuration */
- if (SetupDiGetDeviceRegistryProperty(
- DevInstData->hDevInfo,
- &DevInstData->devInfoData,
- SPDRP_CONFIGFLAGS,
- NULL,
- (BYTE *)&config_flags,
- sizeof(config_flags),
- NULL))
- {
- config_flags |= CONFIGFLAG_FAILEDINSTALL;
- SetupDiSetDeviceRegistryProperty(
- DevInstData->hDevInfo,
- &DevInstData->devInfoData,
- SPDRP_CONFIGFLAGS,
- (BYTE *)&config_flags, sizeof(config_flags) );
- }
-
- PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 0, 0);
- return 0;
-}
-
-static INT_PTR CALLBACK
-FinishDlgProc(
- IN HWND hwndDlg,
- IN UINT uMsg,
- IN WPARAM wParam,
- IN LPARAM lParam)
-{
-
- PDEVINSTDATA DevInstData;
-
- /* 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);
-
- 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 FALSE;
-}
-
-static INT_PTR CALLBACK
-InstFailDlgProc(
- IN HWND hwndDlg,
- IN UINT uMsg,
- IN WPARAM wParam,
- IN LPARAM lParam)
-{
-
- PDEVINSTDATA DevInstData;
-
- /* Get pointer to the global setup data */
- DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
-
- switch (uMsg)
- {
- case WM_INITDIALOG:
- {
- HWND hwndControl;
- BOOL DisableableDevice = FALSE;
-
- DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam;
- SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData);
-
- hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
- ShowWindow (hwndControl, SW_HIDE);
- EnableWindow (hwndControl, FALSE);
-
- /* Set title font */
- SendDlgItemMessage(
- hwndDlg,
- IDC_FINISHTITLE,
- WM_SETFONT,
- (WPARAM)DevInstData->hTitleFont,
- (LPARAM)TRUE);
-
- /* disable the "do not show this dialog anymore" checkbox
- if the device cannot be disabled */
- CanDisableDevice(
- DevInstData->devInfoData.DevInst,
- NULL,
- &DisableableDevice);
- EnableWindow(
- GetDlgItem(hwndDlg, IDC_DONOTSHOWDLG),
- DisableableDevice);
- 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_BACK | PSWIZB_FINISH);
- break;
-
- case PSN_WIZBACK:
- PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_WELCOMEPAGE);
- /* Handle a Back button click, if necessary */
- break;
-
- case PSN_WIZFINISH:
- {
- BOOL DisableableDevice = FALSE;
- BOOL IsStarted = FALSE;
-
- if (CanDisableDevice(DevInstData->devInfoData.DevInst,
- NULL,
- &DisableableDevice) &&
- DisableableDevice &&
- IsDeviceStarted(
- DevInstData->devInfoData.DevInst,
- NULL,
- &IsStarted) &&
- !IsStarted &&
- SendDlgItemMessage(
- hwndDlg,
- IDC_DONOTSHOWDLG,
- BM_GETCHECK,
- (WPARAM) 0, (LPARAM) 0) == BST_CHECKED)
- {
- /* disable the device */
- StartDevice(
- DevInstData->hDevInfo,
- &DevInstData->devInfoData,
- FALSE,
- 0,
- NULL);
- }
- break;
- }
-
- default:
- break;
- }
- break;
- }
-
- default:
- break;
- }
-
- return FALSE;
-}
-
-
-static BOOL
-FindDriver(
+/* Directory and InfFile MUST NOT be specified simultaneously */
+BOOL
+SearchDriver(
IN PDEVINSTDATA DevInstData,
- IN LPCWSTR InfFile OPTIONAL)
+ IN LPCTSTR Directory OPTIONAL,
+ IN LPCTSTR InfFile OPTIONAL)
{
SP_DEVINSTALL_PARAMS DevInstallParams = {0,};
BOOL ret;
@@ -936,16 +261,30 @@
if (InfFile)
{
DevInstallParams.Flags |= DI_ENUMSINGLEINF;
- wcscpy(DevInstallParams.DriverPath, InfFile);
- }
-
- if (!SetupDiSetDeviceInstallParams(DevInstData->hDevInfo,
&DevInstData->devInfoData, &DevInstallParams))
+ _tcsncpy(DevInstallParams.DriverPath, InfFile, MAX_PATH);
+ }
+ else if (Directory)
+ {
+ DevInstallParams.Flags &= ~DI_ENUMSINGLEINF;
+ _tcsncpy(DevInstallParams.DriverPath, Directory, MAX_PATH);
+ }
+ else
+ *DevInstallParams.DriverPath = _T('\0');
+
+ ret = SetupDiSetDeviceInstallParams(
+ DevInstData->hDevInfo,
+ &DevInstData->devInfoData,
+ &DevInstallParams);
+ if (!ret)
{
TRACE("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n",
GetLastError());
return FALSE;
}
- ret = SetupDiBuildDriverInfoList(DevInstData->hDevInfo,
&DevInstData->devInfoData, SPDIT_COMPATDRIVER);
+ ret = SetupDiBuildDriverInfoList(
+ DevInstData->hDevInfo,
+ &DevInstData->devInfoData,
+ SPDIT_COMPATDRIVER);
if (!ret)
{
TRACE("SetupDiBuildDriverInfoList() failed with error 0x%lx\n",
GetLastError());
@@ -966,7 +305,6 @@
TRACE("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError());
return FALSE;
}
- TRACE("Installing driver %S: %S\n", DevInstData->drvInfoData.MfgName,
DevInstData->drvInfoData.Description);
return TRUE;
}
@@ -997,22 +335,22 @@
return _T("");
}
-static BOOL
-SearchDriver(
+BOOL
+SearchDriverRecursive(
IN PDEVINSTDATA DevInstData,
IN LPCTSTR Path)
{
WIN32_FIND_DATA wfd;
- SP_DEVINSTALL_PARAMS DevInstallParams;
TCHAR DirPath[MAX_PATH];
TCHAR FileName[MAX_PATH];
TCHAR FullPath[MAX_PATH];
TCHAR LastDirPath[MAX_PATH] = _T("");
TCHAR PathWithPattern[MAX_PATH];
BOOL ok = TRUE;
- BOOL ret;
- HANDLE hFindFile;
-
+ BOOL retval = FALSE;
+ HANDLE hFindFile = INVALID_HANDLE_VALUE;
+
+ TRACE("SearchDriverRecursive(%s)\n", Path);
_tcscpy(DirPath, Path);
if (DirPath[_tcsclen(DirPath) - 1] != '\\')
@@ -1021,18 +359,21 @@
_tcscpy(PathWithPattern, DirPath);
_tcscat(PathWithPattern, _T("\\*"));
- for (hFindFile = FindFirstFile(PathWithPattern, &wfd); ((hFindFile !=
INVALID_HANDLE_VALUE) && ok); ok = FindNextFile(hFindFile, &wfd))
+ for (hFindFile = FindFirstFile(PathWithPattern, &wfd);
+ ok && hFindFile != INVALID_HANDLE_VALUE;
+ ok = FindNextFile(hFindFile, &wfd))
{
_tcscpy(FileName, wfd.cFileName);
if (IsDots(FileName))
continue;
- if((wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
- {
+ if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ {
+ /* Recursive search */
_tcscpy(FullPath, DirPath);
_tcscat(FullPath, FileName);
- if(SearchDriver(DevInstData, FullPath))
+ if (SearchDriverRecursive(DevInstData, FullPath))
break;
}
else
@@ -1042,48 +383,35 @@
if ((_tcscmp(pszExtension, _T(".inf")) == 0) &&
(_tcscmp(LastDirPath, DirPath) != 0))
{
_tcscpy(LastDirPath, DirPath);
- ZeroMemory (&DevInstallParams, sizeof(SP_DEVINSTALL_PARAMS));
- DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
-
- ret = SetupDiGetDeviceInstallParams(
- DevInstData->hDevInfo,
- &DevInstData->devInfoData,
- &DevInstallParams);
-
- if (_tcsclen(DirPath) <= MAX_PATH)
+
+ if (_tcsclen(DirPath) > MAX_PATH)
+ /* Path is too long to be searched */
+ continue;
+
+ if (SearchDriver(DevInstData, DirPath, NULL))
{
- memcpy(DevInstallParams.DriverPath, DirPath, (_tcsclen(DirPath) + 1) *
sizeof(TCHAR));
+ retval = TRUE;
+ goto cleanup;
}
- ret = SetupDiSetDeviceInstallParams(
- DevInstData->hDevInfo,
- &DevInstData->devInfoData,
- &DevInstallParams);
-
- if ( FindDriver ( DevInstData, NULL ) )
- {
- if (hFindFile != INVALID_HANDLE_VALUE)
- FindClose(hFindFile);
- return TRUE;
- }
-
}
}
}
+cleanup:
if (hFindFile != INVALID_HANDLE_VALUE)
FindClose(hFindFile);
-
- return FALSE;
-}
-
-static BOOL
-InstallDriver(
+ return retval;
+}
+
+BOOL
+InstallCurrentDriver(
IN PDEVINSTDATA DevInstData)
{
-
BOOL ret;
+ TRACE("Installing driver %S: %S\n", DevInstData->drvInfoData.MfgName,
DevInstData->drvInfoData.Description);
+
ret = SetupDiCallClassInstaller(
DIF_SELECTBESTCOMPATDRV,
DevInstData->hDevInfo,
@@ -1185,27 +513,6 @@
}
return TRUE;
-}
-
-static VOID
-CleanUp(VOID)
-{
-
- 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());
- }
-
- if (DevInstData.buffer)
- HeapFree(GetProcessHeap(), 0, DevInstData.buffer);
-
}
/*
@@ -1218,12 +525,10 @@
IN LPCWSTR InstanceId,
IN INT Show)
{
-
- PROPSHEETHEADER psh;
- HPROPSHEETPAGE ahpsp[5];
- PROPSHEETPAGE psp;
+ PDEVINSTDATA DevInstData = NULL;
BOOL ret;
DWORD config_flags;
+ BOOL retval = FALSE;
if (!IsUserAdmin())
{
@@ -1231,46 +536,53 @@
ExitProcess(ERROR_ACCESS_DENIED);
}
+ 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.hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL);
- if (DevInstData.hDevInfo == INVALID_HANDLE_VALUE)
+ ZeroMemory(DevInstData, sizeof(DEVINSTDATA));
+ DevInstData->devInfoData.cbSize = 0; /* Tell if the devInfoData is valid */
+
+ /* Fill devinst data */
+ DevInstData->hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL);
+ if (DevInstData->hDevInfo == INVALID_HANDLE_VALUE)
{
TRACE("SetupDiCreateDeviceInfoListExW() failed with error 0x%lx\n",
GetLastError());
- CleanUp();
- return FALSE;
- }
-
- DevInstData.devInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
+ goto cleanup;
+ }
+
+ DevInstData->devInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
ret = SetupDiOpenDeviceInfoW(
- DevInstData.hDevInfo,
+ DevInstData->hDevInfo,
InstanceId,
NULL,
0, /* Open flags */
- &DevInstData.devInfoData);
+ &DevInstData->devInfoData);
if (!ret)
{
TRACE("SetupDiOpenDeviceInfoW() failed with error 0x%lx (InstanceId %S)\n",
GetLastError(), InstanceId);
- DevInstData.devInfoData.cbSize = 0;
- CleanUp();
- return FALSE;
+ DevInstData->devInfoData.cbSize = 0;
+ goto cleanup;
}
SetLastError(ERROR_GEN_FAILURE);
ret = SetupDiGetDeviceRegistryProperty(
- DevInstData.hDevInfo,
- &DevInstData.devInfoData,
+ DevInstData->hDevInfo,
+ &DevInstData->devInfoData,
SPDRP_DEVICEDESC,
- &DevInstData.regDataType,
+ &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)
+ &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);
@@ -1278,24 +590,23 @@
else
{
ret = SetupDiGetDeviceRegistryProperty(
- DevInstData.hDevInfo,
- &DevInstData.devInfoData,
+ DevInstData->hDevInfo,
+ &DevInstData->devInfoData,
SPDRP_DEVICEDESC,
- &DevInstData.regDataType,
- DevInstData.buffer, DevInstData.requiredSize,
- &DevInstData.requiredSize);
+ &DevInstData->regDataType,
+ DevInstData->buffer, DevInstData->requiredSize,
+ &DevInstData->requiredSize);
}
}
if (!ret)
{
TRACE("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx (InstanceId
%S)\n", GetLastError(), InstanceId);
- CleanUp();
- return FALSE;
+ goto cleanup;
}
if (SetupDiGetDeviceRegistryProperty(
- DevInstData.hDevInfo,
- &DevInstData.devInfoData,
+ DevInstData->hDevInfo,
+ &DevInstData->devInfoData,
SPDRP_CONFIGFLAGS,
NULL,
(BYTE *)&config_flags,
@@ -1304,77 +615,48 @@
{
if (config_flags & CONFIGFLAG_FAILEDINSTALL)
{
- CleanUp();
- return TRUE;
- }
- }
-
- TRACE("Installing %S (%S)\n", DevInstData.buffer, InstanceId);
-
- if ((!FindDriver(&DevInstData, NULL)) && (Show != SW_HIDE))
- {
-
- /* Create the Welcome page */
- ZeroMemory (&psp, sizeof(PROPSHEETPAGE));
- psp.dwSize = sizeof(PROPSHEETPAGE);
- psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
- psp.hInstance = hDllInstance;
- psp.lParam = (LPARAM)&DevInstData;
- 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.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.pfnDlgProc = SearchDrvDlgProc;
- psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV);
- ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp);
-
- /* Create the Finish page */
- psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
- psp.pfnDlgProc = FinishDlgProc;
- psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE);
- ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp);
-
- /* Create the Install failed page */
- psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
- psp.pfnDlgProc = InstFailDlgProc;
- psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER);
- ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp);
-
- /* Create the property sheet */
- psh.dwSize = sizeof(PROPSHEETHEADER);
- psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER;
- psh.hInstance = hDllInstance;
- psh.hwndParent = NULL;
- psh.nPages = 5;
- psh.nStartPage = 0;
- psh.phpage = ahpsp;
- psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);
- psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER);
-
- /* Create title font */
- DevInstData.hTitleFont = CreateTitleFont();
-
- /* Display the wizard */
- PropertySheet(&psh);
-
- DeleteObject(DevInstData.hTitleFont);
-
- }
- else
- {
- InstallDriver ( &DevInstData );
- }
-
- CleanUp();
- return TRUE;
+ /* The device is disabled */
+ retval = TRUE;
+ goto cleanup;
+ }
+ }
+
+ TRACE("Installing %S (%S)\n", DevInstData->buffer, InstanceId);
+
+ /* Search driver in default location */
+ if (SearchDriver(DevInstData, NULL, NULL))
+ {
+ /* Driver found ; install it */
+ retval = InstallCurrentDriver(DevInstData);
+ goto cleanup;
+ }
+ else if (Show == SW_HIDE)
+ {
+ /* We can't show the wizard. Fail the install */
+ goto cleanup;
+ }
+
+ /* Prepare the wizard, and display it */
+ 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;
}
/*
Modified: trunk/reactos/dll/win32/newdev/newdev.h
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.h?r…
==============================================================================
--- trunk/reactos/dll/win32/newdev/newdev.h (original)
+++ trunk/reactos/dll/win32/newdev/newdev.h Fri May 26 02:55:13 2006
@@ -10,6 +10,8 @@
#include "resource.h"
+extern HINSTANCE hDllInstance;
+
typedef struct _DEVINSTDATA
{
HFONT hTitleFont;
@@ -20,6 +22,31 @@
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);
Modified: trunk/reactos/dll/win32/newdev/newdev.rbuild
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.rbu…
==============================================================================
--- trunk/reactos/dll/win32/newdev/newdev.rbuild (original)
+++ trunk/reactos/dll/win32/newdev/newdev.rbuild Fri May 26 02:55:13 2006
@@ -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>
Modified: trunk/reactos/dll/win32/newdev/resource.h
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/resource.h…
==============================================================================
--- trunk/reactos/dll/win32/newdev/resource.h (original)
+++ trunk/reactos/dll/win32/newdev/resource.h Fri May 26 02:55:13 2006
@@ -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 */
6692
days inactive
6692
days old
0 comments
1 participants
participants (1)
-
hpoussin＠svn.reactos.org