diff --git a/reactos/base/applications/devmgmt/devmgmt.rbuild b/reactos/base/applications/devmgmt/devmgmt.rbuild
index f126ab078bf..4c41615c3ca 100644
--- a/reactos/base/applications/devmgmt/devmgmt.rbuild
+++ b/reactos/base/applications/devmgmt/devmgmt.rbuild
@@ -15,6 +15,7 @@
user32
comctl32
advapi32
+ devmgr
about.c
devmgmt.c
diff --git a/reactos/base/applications/devmgmt/enumdevices.c b/reactos/base/applications/devmgmt/enumdevices.c
index da9e04a521c..2a22d0ed6e1 100644
--- a/reactos/base/applications/devmgmt/enumdevices.c
+++ b/reactos/base/applications/devmgmt/enumdevices.c
@@ -12,10 +12,84 @@
static SP_CLASSIMAGELIST_DATA ImageListData;
static HDEVINFO hDevInfo;
-
-VOID OpenPropSheet(HTREEITEM hItem)
+VOID
+FreeDeviceStrings(HWND hTV)
{
- DisplayString(_T("Device Propsheet not yet implemented"));
+ HTREEITEM hItem;
+
+ hItem = TreeView_GetRoot(hTV);
+
+ if (hItem)
+ {
+ hItem = TreeView_GetChild(hTV,
+ hItem);
+ /* loop the parent items */
+ while (hItem)
+ {
+ hItem = TreeView_GetChild(hTV,
+ hItem);
+ if (hItem == NULL)
+ break;
+
+ /* loop the child items and free the DeviceID */
+ while (TRUE)
+ {
+ HTREEITEM hOldItem;
+ TV_ITEM tvItem;
+ //TCHAR Buf[100];
+
+ tvItem.hItem = hItem;
+ tvItem.mask = TVIF_PARAM;// | TVIF_TEXT;
+ //tvItem.pszText = Buf;
+ //tvItem.cchTextMax = 99;
+
+ (void)TreeView_GetItem(hTV, &tvItem);
+
+ //MessageBox(NULL, Buf, NULL, 0);
+
+ HeapFree(GetProcessHeap(),
+ 0,
+ (LPTSTR)tvItem.lParam);
+
+ hOldItem = hItem;
+
+ hItem = TreeView_GetNextSibling(hTV,
+ hItem);
+ if (hItem == NULL)
+ {
+ hItem = hOldItem;
+ break;
+ }
+ }
+
+ hItem = TreeView_GetParent(hTV,
+ hItem);
+ hItem = TreeView_GetNextSibling(hTV,
+ hItem);
+ }
+ }
+}
+
+
+VOID
+OpenPropSheet(HWND hTV,
+ HTREEITEM hItem)
+{
+ TV_ITEM tvItem;
+
+ tvItem.hItem = hItem;
+ tvItem.mask = TVIF_PARAM;
+
+ if (TreeView_GetItem(hTV, &tvItem) &&
+ (LPTSTR)tvItem.lParam != NULL)
+ {
+ DevicePropertiesExW(hTV,
+ NULL,
+ (LPTSTR)tvItem.lParam,
+ 0,
+ FALSE);
+ }
+
}
@@ -23,6 +97,7 @@ static HTREEITEM
InsertIntoTreeView(HWND hTV,
HTREEITEM hRoot,
LPTSTR lpLabel,
+ LPTSTR DeviceID,
INT DevImage)
{
TV_ITEM tvi;
@@ -31,9 +106,10 @@ InsertIntoTreeView(HWND hTV,
ZeroMemory(&tvi, sizeof(tvi));
ZeroMemory(&tvins, sizeof(tvins));
- tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE;
+ tvi.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE;
tvi.pszText = lpLabel;
tvi.cchTextMax = lstrlen(lpLabel);
+ tvi.lParam = (LPARAM)DeviceID;
tvi.iImage = DevImage;
tvi.iSelectedImage = DevImage;
@@ -58,11 +134,11 @@ EnumDeviceClasses(INT ClassIndex,
UINT Ret;
*DevPresent = FALSE;
+ *DevClassName = _T('\0');
Ret = CM_Enumerate_Classes(ClassIndex,
&ClassGuid,
0);
-
if (Ret != CR_SUCCESS)
{
/* all classes enumerated */
@@ -85,10 +161,6 @@ EnumDeviceClasses(INT ClassIndex,
{
lstrcpy(DevClassName, ClassName);
}
- else
- {
- *DevClassName = _T('\0');
- }
if (!SetupDiGetClassImageIndex(&ImageListData,
&ClassGuid,
@@ -111,7 +183,6 @@ EnumDeviceClasses(INT ClassIndex,
return 0;
}
-
KeyClass = SetupDiOpenClassRegKeyEx(&ClassGuid,
MAXIMUM_ALLOWED,
DIOCR_INSTALLER,
@@ -145,67 +216,56 @@ EnumDeviceClasses(INT ClassIndex,
static INT
EnumDevices(INT index,
- TCHAR* DeviceClassName,
- TCHAR* DeviceName)
+ LPTSTR DeviceClassName,
+ LPTSTR DeviceName,
+ LPTSTR *DeviceID)
{
SP_DEVINFO_DATA DeviceInfoData;
- DWORD RequiredSize = 0;
- GUID *guids = NULL;
- BOOL bRet;
+ DWORD DevIdSize;
*DeviceName = _T('\0');
-
- bRet = SetupDiClassGuidsFromName(DeviceClassName,
- NULL,
- RequiredSize,
- &RequiredSize);
- if (RequiredSize == 0)
- return -2;
-
- if (!bRet)
- {
- guids = HeapAlloc(GetProcessHeap(),
- 0,
- RequiredSize * sizeof(GUID));
- if (guids == NULL)
- return -1;
-
- bRet = SetupDiClassGuidsFromName(DeviceClassName,
- guids,
- RequiredSize,
- &RequiredSize);
-
- if (!bRet || RequiredSize == 0)
- {
- /* incorrect class name */
- HeapFree(GetProcessHeap(), 0, guids);
- return -3;
- }
- }
-
- HeapFree(GetProcessHeap(), 0, guids);
- if(hDevInfo == INVALID_HANDLE_VALUE)
- {
- if(!bRet)
- {
- /* device info is unavailable */
- return -4;
- }
- }
+ *DeviceID = NULL;
ZeroMemory(&DeviceInfoData, sizeof(SP_DEVINFO_DATA));
DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
- bRet = SetupDiEnumDeviceInfo(hDevInfo,
- index,
- &DeviceInfoData);
-
- if (!bRet)
+ if (!SetupDiEnumDeviceInfo(hDevInfo,
+ index,
+ &DeviceInfoData))
{
/* no such device */
return -1;
}
+ /* get the device ID */
+ if (!SetupDiGetDeviceInstanceId(hDevInfo,
+ &DeviceInfoData,
+ NULL,
+ 0,
+ &DevIdSize))
+ {
+ if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+ {
+ (*DeviceID) = (LPTSTR)HeapAlloc(GetProcessHeap(),
+ 0,
+ DevIdSize * sizeof(TCHAR));
+ if (*DeviceID)
+ {
+ if (!SetupDiGetDeviceInstanceId(hDevInfo,
+ &DeviceInfoData,
+ *DeviceID,
+ DevIdSize,
+ NULL))
+ {
+ HeapFree(GetProcessHeap(),
+ 0,
+ *DeviceID);
+ *DeviceID = NULL;
+ }
+ }
+ }
+ }
+
/* get the device's friendly name */
if (!SetupDiGetDeviceRegistryProperty(hDevInfo,
&DeviceInfoData,
@@ -216,17 +276,16 @@ EnumDevices(INT index,
NULL))
{
/* if the friendly name fails, try the description instead */
- bRet = SetupDiGetDeviceRegistryProperty(hDevInfo,
- &DeviceInfoData,
- SPDRP_DEVICEDESC,
- 0,
- (BYTE*)DeviceName,
- MAX_DEV_LEN,
- NULL);
- if (!bRet)
+ if (!SetupDiGetDeviceRegistryProperty(hDevInfo,
+ &DeviceInfoData,
+ SPDRP_DEVICEDESC,
+ 0,
+ (BYTE*)DeviceName,
+ MAX_DEV_LEN,
+ NULL))
{
/* if the description fails, just give up! */
- return -5;
+ return -2;
}
}
@@ -241,6 +300,7 @@ ListDevicesByType(PMAIN_WND_INFO Info,
HTREEITEM hDevItem;
TCHAR DevName[MAX_DEV_LEN];
TCHAR DevDesc[MAX_DEV_LEN];
+ LPTSTR DeviceID = NULL;
BOOL DevExist = FALSE;
INT ClassRet;
INT index = 0;
@@ -264,6 +324,7 @@ ListDevicesByType(PMAIN_WND_INFO Info,
hDevItem = InsertIntoTreeView(Info->hTreeView,
hRoot,
DevDesc,
+ NULL,
DevImage);
}
else
@@ -271,6 +332,7 @@ ListDevicesByType(PMAIN_WND_INFO Info,
hDevItem = InsertIntoTreeView(Info->hTreeView,
hRoot,
DevName,
+ NULL,
DevImage);
}
@@ -278,12 +340,14 @@ ListDevicesByType(PMAIN_WND_INFO Info,
{
Ret = EnumDevices(DevIndex,
DevName,
- DeviceName);
+ DeviceName,
+ &DeviceID);
if (Ret == 0)
{
InsertIntoTreeView(Info->hTreeView,
hDevItem,
DeviceName,
+ DeviceID,
DevImage);
}
@@ -298,6 +362,7 @@ ListDevicesByType(PMAIN_WND_INFO Info,
hDevInfo = NULL;
}
+ /* don't insert classes with no devices */
if (!TreeView_GetChild(Info->hTreeView,
hDevItem))
{
@@ -366,6 +431,7 @@ InitTreeView(PMAIN_WND_INFO Info)
hRoot = InsertIntoTreeView(Info->hTreeView,
NULL,
ComputerName,
+ NULL,
RootImage);
return hRoot;
diff --git a/reactos/base/applications/devmgmt/mainwnd.c b/reactos/base/applications/devmgmt/mainwnd.c
index 2a7c95c8281..218a98f5d11 100644
--- a/reactos/base/applications/devmgmt/mainwnd.c
+++ b/reactos/base/applications/devmgmt/mainwnd.c
@@ -285,7 +285,8 @@ OnNotify(PMAIN_WND_INFO Info,
if (!TreeView_GetChild(Info->hTreeView,
hSelected))
{
- OpenPropSheet(hSelected);
+ OpenPropSheet(Info->hTreeView,
+ hSelected);
}
}
break;
@@ -348,13 +349,18 @@ MainWndCommand(PMAIN_WND_INFO Info,
case IDC_PROP:
{
HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView);
- OpenPropSheet(hSelected);
+ OpenPropSheet(Info->hTreeView,
+ hSelected);
}
break;
case IDC_REFRESH:
{
- HTREEITEM hRoot = InitTreeView(Info);
+ HTREEITEM hRoot;
+
+ FreeDeviceStrings(Info->hTreeView);
+
+ hRoot = InitTreeView(Info);
if (hRoot)
ListDevicesByType(Info, hRoot);
}
@@ -525,6 +531,7 @@ MainWndProc(HWND hwnd,
case WM_CLOSE:
{
+ FreeDeviceStrings(Info->hTreeView);
DestroyMenu(Info->hShortcutMenu);
DestroyWindow(hwnd);
}
@@ -532,8 +539,6 @@ MainWndProc(HWND hwnd,
case WM_DESTROY:
{
- //DestroyMainWnd(Info);
-
HeapFree(ProcessHeap,
0,
Info);
diff --git a/reactos/base/applications/devmgmt/precomp.h b/reactos/base/applications/devmgmt/precomp.h
index 2c038a72843..83a27089cff 100644
--- a/reactos/base/applications/devmgmt/precomp.h
+++ b/reactos/base/applications/devmgmt/precomp.h
@@ -53,7 +53,29 @@ HWND CreateMainWindow(LPCTSTR lpCaption, int nCmdShow);
/* enumdevices.c */
-VOID OpenPropSheet(HTREEITEM hItem);
+// undocumented API's from devmgr
+#ifdef _UNICODE
+#define DevicePropertiesEx DevicePropertiesExW
+INT_PTR
+WINAPI
+DevicePropertiesExW(IN HWND hWndParent OPTIONAL,
+ IN LPCWSTR lpMachineName OPTIONAL,
+ IN LPCWSTR lpDeviceID OPTIONAL,
+ IN DWORD dwFlags OPTIONAL,
+ IN BOOL bShowDevMgr);
+#else
+#define DevicePropertiesEx DevicePropertiesExA
+INT_PTR
+WINAPI
+DevicePropertiesExA(IN HWND hWndParent OPTIONAL,
+ IN LPCSTR lpMachineName OPTIONAL,
+ IN LPCSTR lpDeviceID OPTIONAL,
+ IN DWORD dwFlags OPTIONAL,
+ IN BOOL bShowDevMgr);
+#endif
+
+VOID FreeDeviceStrings(HWND hTV);
+VOID OpenPropSheet(HWND hTV, HTREEITEM hItem);
HTREEITEM InitTreeView(PMAIN_WND_INFO Info);
VOID ListDevicesByType(PMAIN_WND_INFO Info, HTREEITEM hRoot);