properly handle the case where devices don't supply any property pages
Modified: trunk/reactos/lib/devmgr/advprop.c
Modified: trunk/reactos/lib/devmgr/hwpage.c
_____
Modified: trunk/reactos/lib/devmgr/advprop.c
--- trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:49:20 UTC (rev
19608)
+++ trunk/reactos/lib/devmgr/advprop.c 2005-11-26 03:52:19 UTC (rev
19609)
@@ -52,7 +52,7 @@
*
* NOTE
*
- * @unimplemented
+ * @implemented
*/
int
WINAPI
@@ -128,7 +128,8 @@
&psh,
0,
&nPropSheets,
- DIGCDP_FLAG_ADVANCED))
+ DIGCDP_FLAG_ADVANCED)
&&
+ nPropSheets != 0)
{
DPRINT1("SetupDiGetClassDevPropertySheets unexpectedly
returned TRUE!\n");
goto Cleanup;
@@ -147,6 +148,8 @@
goto Cleanup;
}
+ /* FIXME - add the "General" and "Driver" pages */
+
if (!SetupDiGetClassDevPropertySheets(hDevInfo,
&DevInfoData,
&psh,
@@ -157,8 +160,6 @@
goto Cleanup;
}
- /* FIXME - add "General" and "Driver" page */
-
Ret = pPropertySheetW(&psh);
}
@@ -194,7 +195,7 @@
*
* NOTE
*
- * @unimplemented
+ * @implemented
*/
int
WINAPI
_____
Modified: trunk/reactos/lib/devmgr/hwpage.c
--- trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 03:49:20 UTC (rev
19608)
+++ trunk/reactos/lib/devmgr/hwpage.c 2005-11-26 03:52:19 UTC (rev
19609)
@@ -967,6 +967,8 @@
* 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 @@
* Returns the handle of the hardware page window that has been
created or
* NULL if it failed.
*
- * REVISIONS
- *
- * NOTE
- *
+ * @implemented
*/
HWND
WINAPI