mirror of
https://github.com/reactos/reactos.git
synced 2025-02-23 00:45:24 +00:00
properly handle the case where devices don't supply any property pages
svn path=/trunk/; revision=19609
This commit is contained in:
parent
b85ab799c0
commit
6fb67e9ff4
2 changed files with 9 additions and 9 deletions
|
@ -52,7 +52,7 @@ typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW);
|
|||
*
|
||||
* NOTE
|
||||
*
|
||||
* @unimplemented
|
||||
* @implemented
|
||||
*/
|
||||
int
|
||||
WINAPI
|
||||
|
@ -128,7 +128,8 @@ DeviceAdvancedPropertiesW(HWND hWndParent,
|
|||
&psh,
|
||||
0,
|
||||
&nPropSheets,
|
||||
DIGCDP_FLAG_ADVANCED))
|
||||
DIGCDP_FLAG_ADVANCED) &&
|
||||
nPropSheets != 0)
|
||||
{
|
||||
DPRINT1("SetupDiGetClassDevPropertySheets unexpectedly returned TRUE!\n");
|
||||
goto Cleanup;
|
||||
|
@ -147,6 +148,8 @@ DeviceAdvancedPropertiesW(HWND hWndParent,
|
|||
goto Cleanup;
|
||||
}
|
||||
|
||||
/* FIXME - add the "General" and "Driver" pages */
|
||||
|
||||
if (!SetupDiGetClassDevPropertySheets(hDevInfo,
|
||||
&DevInfoData,
|
||||
&psh,
|
||||
|
@ -157,8 +160,6 @@ DeviceAdvancedPropertiesW(HWND hWndParent,
|
|||
goto Cleanup;
|
||||
}
|
||||
|
||||
/* FIXME - add "General" and "Driver" page */
|
||||
|
||||
Ret = pPropertySheetW(&psh);
|
||||
}
|
||||
|
||||
|
@ -194,7 +195,7 @@ Cleanup:
|
|||
*
|
||||
* NOTE
|
||||
*
|
||||
* @unimplemented
|
||||
* @implemented
|
||||
*/
|
||||
int
|
||||
WINAPI
|
||||
|
|
|
@ -967,6 +967,8 @@ HardwareDlgProc(IN HWND hwndDlg,
|
|||
* RETURN VALUE
|
||||
* Returns the handle of the hardware page window that has been created or
|
||||
* NULL if it failed.
|
||||
*
|
||||
* @implemented
|
||||
*/
|
||||
HWND
|
||||
WINAPI
|
||||
|
@ -1053,10 +1055,7 @@ Cleanup:
|
|||
* Returns the handle of the hardware page window that has been created or
|
||||
* NULL if it failed.
|
||||
*
|
||||
* REVISIONS
|
||||
*
|
||||
* NOTE
|
||||
*
|
||||
* @implemented
|
||||
*/
|
||||
HWND
|
||||
WINAPI
|
||||
|
|
Loading…
Reference in a new issue