-fixed some msvc /W4 warnings

svn path=/trunk/; revision=22911
This commit is contained in:
Christoph von Wittich 2006-07-08 10:22:35 +00:00
parent b6ec400d02
commit 551d3ecaaa

View file

@ -421,6 +421,7 @@ WelcomeDlgProc(
IN LPARAM lParam) IN LPARAM lParam)
{ {
PDEVINSTDATA DevInstData; PDEVINSTDATA DevInstData;
UNREFERENCED_PARAMETER(wParam);
/* Retrieve pointer to the global setup data */ /* Retrieve pointer to the global setup data */
DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
@ -861,6 +862,8 @@ NoDriverDlgProc(
PDEVINSTDATA DevInstData; PDEVINSTDATA DevInstData;
HWND hwndControl; HWND hwndControl;
UNREFERENCED_PARAMETER(wParam);
/* Get pointer to the global setup data */ /* Get pointer to the global setup data */
DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
@ -968,6 +971,7 @@ InstallFailedDlgProc(
IN LPARAM lParam) IN LPARAM lParam)
{ {
PDEVINSTDATA DevInstData; PDEVINSTDATA DevInstData;
UNREFERENCED_PARAMETER(wParam);
/* Retrieve pointer to the global setup data */ /* Retrieve pointer to the global setup data */
DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
@ -1043,6 +1047,7 @@ FinishDlgProc(
IN LPARAM lParam) IN LPARAM lParam)
{ {
PDEVINSTDATA DevInstData; PDEVINSTDATA DevInstData;
UNREFERENCED_PARAMETER(wParam);
/* Retrieve pointer to the global setup data */ /* Retrieve pointer to the global setup data */
DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
@ -1151,43 +1156,43 @@ DisplayWizard(
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
psp.hInstance = hDllInstance; psp.hInstance = hDllInstance;
psp.lParam = (LPARAM)DevInstData; psp.lParam = (LPARAM)DevInstData;
psp.pfnDlgProc = WelcomeDlgProc; psp.pfnDlgProc = (DLGPROC) WelcomeDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE); psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE);
ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp); ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp);
/* Create the Select Source page */ /* Create the Select Source page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pfnDlgProc = CHSourceDlgProc; psp.pfnDlgProc = (DLGPROC) CHSourceDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE); psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE);
ahpsp[IDD_CHSOURCE] = CreatePropertySheetPage(&psp); ahpsp[IDD_CHSOURCE] = CreatePropertySheetPage(&psp);
/* Create the Search driver page */ /* Create the Search driver page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pfnDlgProc = SearchDrvDlgProc; psp.pfnDlgProc = (DLGPROC) SearchDrvDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV); psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV);
ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp); ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp);
/* Create the Install driver page */ /* Create the Install driver page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pfnDlgProc = InstallDrvDlgProc; psp.pfnDlgProc = (DLGPROC) InstallDrvDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV); psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV);
ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp); ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp);
/* Create the No driver page */ /* Create the No driver page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
psp.pfnDlgProc = NoDriverDlgProc; psp.pfnDlgProc = (DLGPROC) NoDriverDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER); psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER);
ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp); ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp);
/* Create the Install failed page */ /* Create the Install failed page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
psp.pfnDlgProc = InstallFailedDlgProc; psp.pfnDlgProc = (DLGPROC) InstallFailedDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED); psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED);
ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp); ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp);
/* Create the Finish page */ /* Create the Finish page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
psp.pfnDlgProc = FinishDlgProc; psp.pfnDlgProc = (DLGPROC) FinishDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE); psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE);
ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp); ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp);