From 6fb67e9ff43d39fc2a3d02eee5f417ccd5d124a6 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sat, 26 Nov 2005 03:52:19 +0000
Subject: [PATCH] properly handle the case where devices don't supply any
 property pages

svn path=/trunk/; revision=19609
---
 reactos/lib/devmgr/advprop.c | 11 ++++++-----
 reactos/lib/devmgr/hwpage.c  |  7 +++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/reactos/lib/devmgr/advprop.c b/reactos/lib/devmgr/advprop.c
index 925f2e1032d..d6c44e1833d 100644
--- a/reactos/lib/devmgr/advprop.c
+++ b/reactos/lib/devmgr/advprop.c
@@ -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
diff --git a/reactos/lib/devmgr/hwpage.c b/reactos/lib/devmgr/hwpage.c
index 801752f15e5..c96e48e8b10 100644
--- a/reactos/lib/devmgr/hwpage.c
+++ b/reactos/lib/devmgr/hwpage.c
@@ -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