[ros-diffs] [weiden] 19594: display the device location

display the device location
Modified: trunk/reactos/lib/devmgr/En.rc
Modified: trunk/reactos/lib/devmgr/hwpage.c
Modified: trunk/reactos/lib/devmgr/resource.h
  _____

Modified: trunk/reactos/lib/devmgr/En.rc
--- trunk/reactos/lib/devmgr/En.rc	2005-11-25 23:49:10 UTC (rev
19593)
+++ trunk/reactos/lib/devmgr/En.rc	2005-11-26 00:25:25 UTC (rev
19594)
@@ -9,6 +9,8 @@

IDS_MANUFACTURER "Manufacturer: %1"
     IDS_LOCATION "Location: %1"
     IDS_STATUS "Device Status: %1"
+    IDS_UNKNOWN "Unknown"
+    IDS_LOCATIONSTR "Location %1!u! (%2)"
 END

IDD_HARDWARE DIALOG DISCARDABLE  0, 0, 300, 400
  _____

Modified: trunk/reactos/lib/devmgr/hwpage.c
--- trunk/reactos/lib/devmgr/hwpage.c	2005-11-25 23:49:10 UTC (rev
19593)
+++ trunk/reactos/lib/devmgr/hwpage.c	2005-11-26 00:25:25 UTC (rev
19594)
@@ -131,7 +131,6 @@

{
     PHWDEVINFO HwDevInfo;
     HWND hBtnTroubleShoot, hBtnProperties;
-    DWORD RegDataType;

hBtnTroubleShoot = GetDlgItem(hpd->hWnd,
                                   IDC_TROUBLESHOOT);
@@ -142,9 +141,13 @@
     if (HwDevInfo != NULL)
     {
         /* update static controls */
+        CONFIGRET cRet;
+        DWORD RegDataType;
+        ULONG DataSize;
         WCHAR szBuffer[256];
         LPWSTR szFormatted = NULL;

+        /* get the manufacturer string */
         if
(!SetupDiGetDeviceRegistryProperty(HwDevInfo->ClassDevInfo->hDevInfo,
                                               &HwDevInfo->DevInfoData,
                                               SPDRP_MFG,
@@ -154,9 +157,9 @@
                                               NULL) ||
             RegDataType != REG_SZ)
         {
-            /* FIXME - check string for NULL termination! */
             szBuffer[0] = L'\0';
         }
+        /* FIXME - check string for NULL termination! */
         if (LoadAndFormatString(hDllInstance,
                                 IDS_MANUFACTURER,
                                 &szFormatted,
@@ -168,7 +171,63 @@
             LocalFree((HLOCAL)szFormatted);
         }

-        /* FIXME - Display location and status */
+        /* get the location string */
+        DataSize = sizeof(szBuffer);
+        cRet =
CM_Get_DevNode_Registry_Property(HwDevInfo->DevInfoData.DevInst,
+
CM_DRP_LOCATION_INFORMATION,
+                                                &RegDataType,
+                                                szBuffer,
+                                                &DataSize,
+                                                0);
+        if (cRet != CR_SUCCESS ||
+            RegDataType != REG_SZ)
+        {
+            szBuffer[0] = L'\0';
+
+            if (cRet == CR_NO_SUCH_REGISTRY_KEY ||
+                cRet == CR_NO_SUCH_VALUE)
+            {
+                LoadString(hDllInstance,
+                           IDS_UNKNOWN,
+                           szBuffer,
+                           sizeof(szBuffer) / sizeof(szBuffer[0]));
+            }
+        }
+        /* FIXME - check string for NULL termination! */
+
+        if (szBuffer[0] >= L'0' && szBuffer[0] <= L'9')
+        {
+            /* convert the string to an integer value and create a
+               formatted string */
+            unsigned long ulLocation = wcstoul(szBuffer,
+                                               NULL,
+                                               10);
+            if (LoadAndFormatString(hDllInstance,
+                                    IDS_LOCATIONSTR,
+                                    &szFormatted,
+                                    ulLocation,
+                                    szBuffer) != 0)
+            {
+                wcsncpy(szBuffer,
+                        szFormatted,
+                        (sizeof(szBuffer) / sizeof(szBuffer[0])) - 1);
+                szBuffer[(sizeof(szBuffer) / sizeof(szBuffer[0])) - 1]
= L'\0';
+                LocalFree((HLOCAL)szFormatted);
+            }
+        }
+
+        if (LoadAndFormatString(hDllInstance,
+                                IDS_LOCATION,
+                                &szFormatted,
+                                szBuffer) != 0)
+        {
+            SetDlgItemText(hpd->hWnd,
+                           IDC_LOCATION,
+                           szFormatted);
+            LocalFree((HLOCAL)szFormatted);
+        }
+
+        /* FIXME - Display the device status */
     }
     else
     {
@@ -186,8 +245,8 @@

EnableWindow(hBtnTroubleShoot,
                  HwDevInfo != NULL);
-    EnableWindow(hBtnTroubleShoot,
-                 hBtnProperties != NULL);
+    EnableWindow(hBtnProperties,
+                 HwDevInfo != NULL);
 }

static VOID
  _____

Modified: trunk/reactos/lib/devmgr/resource.h
--- trunk/reactos/lib/devmgr/resource.h	2005-11-25 23:49:10 UTC (rev
19593)
+++ trunk/reactos/lib/devmgr/resource.h	2005-11-26 00:25:25 UTC (rev
19594)
@@ -21,8 +21,9 @@

#define IDS_MANUFACTURER	0x102
 #define IDS_LOCATION		0x103
 #define IDS_STATUS		0x104
+#define IDS_UNKNOWN		0x105
+#define IDS_LOCATIONSTR		0x106

-
 #endif /* __DEVMGR_RESOURCE_H */

/* EOF */