[DEVMGR]

DeviceAdvancedProperties: Show the details page of a device property sheet in extended mode only.

svn path=/trunk/; revision=56103

diff --git a/reactos/dll/win32/devmgr/advprop.c b/reactos/dll/win32/devmgr/advprop.c
index 4b802a4..f8aeb2f 100644 (file)
--- a/reactos/dll/win32/devmgr/advprop.c
+++ b/reactos/dll/win32/devmgr/advprop.c
@@ -66,6 +66,7 @@ typedef struct _DEVADVPROP_INFO
         UINT Flags;
         struct
         {
         UINT Flags;
         struct
         {

+            UINT Extended : 1;

             UINT FreeDevPropSheets : 1;
             UINT CanDisable : 1;
             UINT DeviceStarted : 1;
             UINT FreeDevPropSheets : 1;
             UINT CanDisable : 1;
             UINT DeviceStarted : 1;


@@ -2019,7 +2020,8 @@ GetParentNode:
         dap->nDevPropSheets++;
 
     /* include the details page */
         dap->nDevPropSheets++;
 
     /* include the details page */

-    dap->nDevPropSheets++;
+    if (dap->Extended)
+        dap->nDevPropSheets++;

 
     /* add the device property sheets */
     if (dap->nDevPropSheets != 0)
 
     /* add the device property sheets */
     if (dap->nDevPropSheets != 0)


@@ -2093,8 +2095,9 @@ GetParentNode:
                 }
             }
 
                 }
             }
 

-            if (1)
+            if (dap->Extended)

             {
             {

+                /* Add the details page */

                 PROPSHEETPAGE pspDetails = {0};
                 pspDetails.dwSize = sizeof(PROPSHEETPAGE);
                 pspDetails.dwFlags = PSP_DEFAULT;
                 PROPSHEETPAGE pspDetails = {0};
                 pspDetails.dwSize = sizeof(PROPSHEETPAGE);
                 pspDetails.dwFlags = PSP_DEFAULT;


@@ -2117,9 +2120,9 @@ GetParentNode:
                         dap->DevPropSheets[iPage] = NULL;
                     }
                 }
                         dap->DevPropSheets[iPage] = NULL;
                     }
                 }

-            }

 
 

-            /* FIXME: Add the resources page */
+                /* FIXME: Add the resources page */
+            }

 
             /* FIXME: Add the power page */
         }
 
             /* FIXME: Add the power page */
         }


@@ -2445,6 +2448,7 @@ DisplayDeviceAdvancedProperties(IN HWND hWndParent,
 
     DevAdvPropInfo->IsAdmin = IsUserAdmin();
     DevAdvPropInfo->DoDefaultDevAction = ((dwFlags & DPF_DEVICE_STATUS_ACTION) != 0);
 
     DevAdvPropInfo->IsAdmin = IsUserAdmin();
     DevAdvPropInfo->DoDefaultDevAction = ((dwFlags & DPF_DEVICE_STATUS_ACTION) != 0);

+    DevAdvPropInfo->Extended = ((dwFlags & DPF_EXTENDED) != 0);

 
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags = PSH_PROPTITLE | PSH_NOAPPLYNOW;
 
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags = PSH_PROPTITLE | PSH_NOAPPLYNOW;