Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 64543: [DEVMGR] - Include "precomp.h" instead of <windef.h>. - Use UNIMPLEMENTED again.
by ekohl＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: ekohl Date: Sun Oct 5 12:40:22 2014 New Revision: 64543 URL: http://svn.reactos.org/svn/reactos?rev=64543&view=rev Log: [DEVMGR] - Include "precomp.h" instead of <windef.h>. - Use UNIMPLEMENTED again. Modified: trunk/reactos/dll/win32/devmgr/stubs.c Modified: trunk/reactos/dll/win32/devmgr/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] Sun Oct 5 12:40:22 2014 @@ -16,7 +16,7 @@ * 04-04-2004 Created */ -#include <windef.h> +#include "precomp.h" /*************************************************************************** @@ -51,7 +51,7 @@ LPCSTR lpMachineName, int nCmdShow) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; return FALSE; } @@ -88,7 +88,7 @@ LPCWSTR lpMachineName, int nCmdShow) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; return FALSE; } @@ -127,7 +127,7 @@ LPCSTR lpDeviceCmd, int nCmdShow) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; } @@ -165,7 +165,7 @@ LPCWSTR lpDeviceCmd, int nCmdShow) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; } @@ -208,7 +208,7 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; return FALSE; } @@ -252,6 +252,6 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - FIXME("unimplemented\n"); - return FALSE; -} + UNIMPLEMENTED; + return FALSE; +}

1 0

[ekohl] 64542: [DEVMGR] Replace UNIMPLMENTED by FIXME.
by ekohl＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: ekohl Date: Sun Oct 5 12:34:07 2014 New Revision: 64542 URL: http://svn.reactos.org/svn/reactos?rev=64542&view=rev Log: [DEVMGR] Replace UNIMPLMENTED by FIXME. Modified: trunk/reactos/dll/win32/devmgr/stubs.c Modified: trunk/reactos/dll/win32/devmgr/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] Sun Oct 5 12:34:07 2014 @@ -51,7 +51,7 @@ LPCSTR lpMachineName, int nCmdShow) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); return FALSE; } @@ -88,7 +88,7 @@ LPCWSTR lpMachineName, int nCmdShow) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); return FALSE; } @@ -127,7 +127,7 @@ LPCSTR lpDeviceCmd, int nCmdShow) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); } @@ -165,7 +165,7 @@ LPCWSTR lpDeviceCmd, int nCmdShow) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); } @@ -208,7 +208,7 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); return FALSE; } @@ -252,6 +252,6 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - UNIMPLEMENTED; - return FALSE; -} + FIXME("unimplemented\n"); + return FALSE; +}

1 0

[ekohl] 64541: [DEVMGR] Use a new debug channel 'devmgr' instead of DPRINTFs.
by ekohl＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: ekohl Date: Sun Oct 5 12:25:05 2014 New Revision: 64541 URL: http://svn.reactos.org/svn/reactos?rev=64541&view=rev Log: [DEVMGR] Use a new debug channel 'devmgr' instead of DPRINTFs. Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/devprblm.c trunk/reactos/dll/win32/devmgr/hwpage.c trunk/reactos/dll/win32/devmgr/hwresource.c trunk/reactos/dll/win32/devmgr/misc.c trunk/reactos/dll/win32/devmgr/precomp.h trunk/reactos/dll/win32/devmgr/stubs.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -31,8 +31,6 @@ #include <winver.h> -#define NDEBUG -#include <debug.h> static UINT WINAPI EnumDeviceDriverFilesCallback(IN PVOID Context, @@ -440,14 +438,14 @@ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) { - DPRINT("OpenProcessToken failed\n"); + ERR("OpenProcessToken failed\n"); return; } /* Get the LUID for the Shutdown privilege */ if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) { - DPRINT("LookupPrivilegeValue failed\n"); + ERR("LookupPrivilegeValue failed\n"); CloseHandle(hToken); return; } @@ -458,7 +456,7 @@ if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) { - DPRINT("AdjustTokenPrivileges failed\n"); + ERR("AdjustTokenPrivileges failed\n"); CloseHandle(hToken); return; } @@ -466,7 +464,7 @@ /* Finally shut down the system */ if (!ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) { - DPRINT("ExitWindowsEx failed\n"); + ERR("ExitWindowsEx failed\n"); CloseHandle(hToken); } } @@ -1587,8 +1585,8 @@ else { /* FIXME - display an error message */ - DPRINT1("Failed to enable/disable device! LastError: %d\n", - GetLastError()); + FIXME("Failed to enable/disable device! LastError: %d\n", + GetLastError()); } } else @@ -2411,7 +2409,7 @@ 0, &DevIdSize)) { - DPRINT1("SetupDiGetDeviceInstanceId unexpectedly returned TRUE!\n"); + ERR("SetupDiGetDeviceInstanceId unexpectedly returned TRUE!\n"); return -1; } @@ -2903,7 +2901,7 @@ if (dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)) { - DPRINT1("DevPropertiesExW: Invalid flags: 0x%x\n", + FIXME("DevPropertiesExW: Invalid flags: 0x%x\n", dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)); SetLastError(ERROR_INVALID_FLAGS); return -1; @@ -2911,7 +2909,7 @@ if (bShowDevMgr) { - DPRINT("DevPropertiesExW doesn't support bShowDevMgr!\n"); + FIXME("DevPropertiesExW doesn't support bShowDevMgr!\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } else @@ -3132,7 +3130,7 @@ szDeviceID, szMachineName)) { - DPRINT1("DeviceProperties_RunDLLW DeviceID: %S, MachineName: %S\n", szDeviceID, szMachineName); + ERR("DeviceProperties_RunDLLW DeviceID: %S, MachineName: %S\n", szDeviceID, szMachineName); return; } Modified: trunk/reactos/dll/win32/devmgr/devprblm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devprblm.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -27,8 +27,6 @@ #include "precomp.h" -#define NDEBUG -#include <debug.h> BOOL ShowDeviceProblemWizard(IN HWND hWndParent OPTIONAL, Modified: trunk/reactos/dll/win32/devmgr/hwpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwpage.c?… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -27,8 +27,6 @@ #include "precomp.h" -#define NDEBUG -#include <debug.h> typedef struct _HWDEVINFO { @@ -314,8 +312,8 @@ } else { - DPRINT1("Unable to allocate memory for %d SP_DEVINFO_DATA structures!\n", - ClassDevInfo->ItemCount + 1); + ERR("Unable to allocate memory for %d SP_DEVINFO_DATA structures!\n", + ClassDevInfo->ItemCount + 1); break; } } @@ -326,7 +324,7 @@ sizeof(HWDEVINFO)); if (ClassDevInfo->HwDevInfo == NULL) { - DPRINT1("Unable to allocate memory for a SP_DEVINFO_DATA structures!\n"); + ERR("Unable to allocate memory for a SP_DEVINFO_DATA structures!\n"); break; } } Modified: trunk/reactos/dll/win32/devmgr/hwresource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwresourc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwresource.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwresource.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -9,8 +9,6 @@ #include "precomp.h" -#define NDEBUG -#include <debug.h> typedef struct { Modified: trunk/reactos/dll/win32/devmgr/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/misc.c?re… ============================================================================== --- trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -27,8 +27,6 @@ #include "precomp.h" -#define NDEBUG -#include <debug.h> HINSTANCE hDllInstance = NULL; @@ -954,7 +952,7 @@ DeviceInfoData, &InstallParams)) { - DPRINT1("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } @@ -990,7 +988,7 @@ KEY_QUERY_VALUE); if (hKey == INVALID_HANDLE_VALUE) { - DPRINT1("SetupDiOpenDevRegKey() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiOpenDevRegKey() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } @@ -1004,14 +1002,14 @@ &dwLength); if (rc != ERROR_SUCCESS) { + ERR("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); SetLastError(rc); - DPRINT1("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } else if (dwType != REG_SZ) { + ERR("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); SetLastError(ERROR_GEN_FAILURE); - DPRINT1("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); goto Cleanup; } InfPath[(dwLength / sizeof(WCHAR)) - 1] = L'\0'; @@ -1024,7 +1022,7 @@ DeviceInfoData, &InstallParams)) { - DPRINT1("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } @@ -1033,7 +1031,7 @@ DeviceInfoData, SPDIT_CLASSDRIVER)) { - DPRINT1("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } @@ -1047,14 +1045,14 @@ &dwLength); if (rc != ERROR_SUCCESS) { + ERR("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); SetLastError(rc); - DPRINT1("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } else if (dwType != REG_SZ) { + ERR("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); SetLastError(ERROR_GEN_FAILURE); - DPRINT1("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); goto Cleanup; } InfPath[(dwLength / sizeof(WCHAR)) - 1] = L'\0'; @@ -1077,7 +1075,7 @@ NULL) && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - DPRINT1("SetupDiGetDriverInfoDetail() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiGetDriverInfoDetail() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } if (!wcsicmp(DriverInfoDetailData.SectionName, @@ -1092,7 +1090,7 @@ } if (GetLastError() != ERROR_NO_MORE_ITEMS) { - DPRINT1("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -14,12 +14,13 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <dll/devmgr/devmgr.h> +#include <wine/debug.h> #include "resource.h" +WINE_DEFAULT_DEBUG_CHANNEL(devmgr); + extern HINSTANCE hDllInstance; - -ULONG DbgPrint(PCCH Format,...); typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW); typedef HPROPSHEETPAGE (WINAPI *PCREATEPROPERTYSHEETPAGEW)(LPCPROPSHEETPAGEW); Modified: trunk/reactos/dll/win32/devmgr/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -18,8 +18,6 @@ #include <windef.h> -#define NDEBUG -#include <debug.h> /*************************************************************************** * NAME EXPORTED

1 0

[cwittich] 64540: [uxtheme] fix a typo
by cwittich＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: cwittich Date: Sun Oct 5 11:02:11 2014 New Revision: 64540 URL: http://svn.reactos.org/svn/reactos?rev=64540&view=rev Log: [uxtheme] fix a typo Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Sun Oct 5 11:02:11 2014 @@ -156,7 +156,7 @@ } CAPTIONBUTTON; /* -The following values specify all possible vutton states +The following values specify all possible button states Note that not all of them are documented but it is easy to find them by opening a theme file */

1 0

[jgardou] 64539: [MSI] - Revert unwanted change
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 10:02:34 2014 New Revision: 64539 URL: http://svn.reactos.org/svn/reactos?rev=64539&view=rev Log: [MSI] - Revert unwanted change Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Oct 5 10:02:34 2014 @@ -5,7 +5,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -spec2def(msi.dll msi.spec ADD_IMPORTLIB WITH_RELAY) +spec2def(msi.dll msi.spec ADD_IMPORTLIB) generate_idl_iids(msiserver.idl)

1 0

[jgardou] 64538: [LIBWINE] - Add support for the +tid debug channel, prefixing every traces with the current thread ID.
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 09:57:11 2014 New Revision: 64538 URL: http://svn.reactos.org/svn/reactos?rev=64538&view=rev Log: [LIBWINE] - Add support for the +tid debug channel, prefixing every traces with the current thread ID. Modified: trunk/reactos/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] Sun Oct 5 09:57:11 2014 @@ -35,6 +35,8 @@ #include <rtlfuncs.h> #include <cmfuncs.h> +WINE_DECLARE_DEBUG_CHANNEL(tid); + ULONG NTAPI vDbgPrintExWithPrefix( @@ -416,6 +418,9 @@ { int ret = 0; + if (TRACE_ON(tid)) + ret += wine_dbg_printf("%04x:", HandleToULong(NtCurrentTeb()->ClientId.UniqueThread)); + if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) ret += wine_dbg_printf( "%s:", debug_classes[cls] );

1 0

[jgardou] 64537: [NTOS/MM] - Do not assert in case of stack overflow, just let the page fault handler raise STATUS_STACK_OVERFLOW
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 09:57:02 2014 New Revision: 64537 URL: http://svn.reactos.org/svn/reactos?rev=64537&view=rev Log: [NTOS/MM] - Do not assert in case of stack overflow, just let the page fault handler raise STATUS_STACK_OVERFLOW Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Oct 5 09:57:02 2014 @@ -82,7 +82,6 @@ { /* We don't -- Windows would try to make this guard page valid now */ DPRINT1("Close to our death...\n"); - ASSERT(FALSE); return STATUS_STACK_OVERFLOW; }

1 0

[jgardou] 64536: [MSI] - Do not use PCH with auto-generated files.
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 09:56:48 2014 New Revision: 64536 URL: http://svn.reactos.org/svn/reactos?rev=64536&view=rev Log: [MSI] - Do not use PCH with auto-generated files. Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Oct 5 09:56:48 2014 @@ -5,7 +5,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -spec2def(msi.dll msi.spec ADD_IMPORTLIB) +spec2def(msi.dll msi.spec ADD_IMPORTLIB WITH_RELAY) generate_idl_iids(msiserver.idl) @@ -51,12 +51,12 @@ update.c upgrade.c where.c - msipriv.h - ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c - ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c) + msipriv.h) add_library(msi SHARED ${SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c + ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c msi.rc ${CMAKE_CURRENT_BINARY_DIR}/msi.def)

1 0

[ekohl] 64535: [SETUPAPI] Add overlay icons to the class image list.
by ekohl＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: ekohl Date: Sun Oct 5 08:55:55 2014 New Revision: 64535 URL: http://svn.reactos.org/svn/reactos?rev=64535&view=rev Log: [SETUPAPI] Add overlay icons to the class image list. Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Sun Oct 5 08:55:55 2014 @@ -486,6 +486,7 @@ HICON hIcon; DWORD size; INT i, bpp; + UINT idx; /* Get list of all class GUIDs in given computer */ ret = SetupDiBuildClassInfoListExW( @@ -587,6 +588,19 @@ } else list->IconIndexes[i] = -1; /* Special value to indicate that the icon is unavailable */ + } + + /* Finally, add the overlay icons to the image list */ + for (i = 0; i < 2; i++) + { + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(500 + i), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + if (hIcon) + { + idx = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + if (idx != -1) + ImageList_SetOverlayImage(ClassImageListData->ImageList, idx, i); + DestroyIcon(hIcon); + } } ret = TRUE;

1 0

[ekohl] 64534: [DEVMGMT] - Reimplement the 'list by device type' function. The old implementation did not list devices as 'unknown devices' if they had no device class GUID or an unknown class GUID...
by ekohl＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: ekohl Date: Sun Oct 5 08:53:51 2014 New Revision: 64534 URL: http://svn.reactos.org/svn/reactos?rev=64534&view=rev Log: [DEVMGMT] - Reimplement the 'list by device type' function. The old implementation did not list devices as 'unknown devices' if they had no device class GUID or an unknown class GUID. - Use overlay images to indicate problems on a device. Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c trunk/reactos/base/applications/mscutils/devmgmt/precomp.h Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] Sun Oct 5 08:53:51 2014 @@ -15,9 +15,7 @@ #include <devguid.h> static SP_CLASSIMAGELIST_DATA ImageListData; -static HDEVINFO hDevInfo; - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + VOID FreeDeviceStrings(HWND hTreeView) @@ -96,7 +94,6 @@ DPF_EXTENDED, FALSE); } - } @@ -106,7 +103,7 @@ LPTSTR lpLabel, LPTSTR DeviceID, INT DevImage, - LONG DevProb) + UINT OverlayImage) { TV_ITEM tvi; TV_INSERTSTRUCT tvins; @@ -121,15 +118,11 @@ tvi.iImage = DevImage; tvi.iSelectedImage = DevImage; - if (DevProb != 0) - { + if (OverlayImage != 0) + { + tvi.mask |= TVIF_STATE; tvi.stateMask = TVIS_OVERLAYMASK; - - if (DevProb == CM_PROB_DISABLED) - { - /* FIXME: set the overlay icon */ - } - + tvi.state = INDEXTOOVERLAYMASK(OverlayImage); } tvins.item = tvi; @@ -139,212 +132,295 @@ } -static INT -EnumDeviceClasses(INT ClassIndex, - BOOL ShowHidden, - LPTSTR DevClassName, - LPTSTR DevClassDesc, - BOOL *DevPresent, - INT *ClassImage, - BOOL *IsUnknown, - BOOL *IsHidden) -{ +static +ULONG +GetClassCount(VOID) +{ + ULONG ulClassIndex; GUID ClassGuid; - HKEY KeyClass; - TCHAR ClassName[MAX_CLASS_NAME_LEN]; - DWORD RequiredSize = MAX_CLASS_NAME_LEN; - UINT Ret; - - *DevPresent = FALSE; - *DevClassName = _T('\0'); - *IsHidden = FALSE; - - Ret = CM_Enumerate_Classes(ClassIndex, - &ClassGuid, - 0); - if (Ret != CR_SUCCESS) - { - /* all classes enumerated */ - if(Ret == CR_NO_SUCH_VALUE) - { - return -1; - } - - if (Ret == CR_INVALID_DATA) - { - ; /*FIXME: what should we do here? */ - } - - /* handle other errors... */ - } - - /* This case is special because these devices don't show up with normal class enumeration */ - *IsUnknown = IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_UNKNOWN); - - if (ShowHidden == FALSE && - (IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) || - IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_VOLUME))) - *IsHidden = TRUE; - - if (SetupDiClassNameFromGuid(&ClassGuid, - ClassName, - RequiredSize, - &RequiredSize)) - { - lstrcpy(DevClassName, ClassName); - } - - if (!SetupDiGetClassImageIndex(&ImageListData, - &ClassGuid, - ClassImage)) - { - /* FIXME: can we do this? - * Set the blank icon: IDI_SETUPAPI_BLANK = 41 - * it'll be image 24 in the imagelist */ - *ClassImage = 24; - } - - /* Get device info for all devices of a particular class */ - hDevInfo = SetupDiGetClassDevs(*IsUnknown ? NULL : &ClassGuid, - NULL, - NULL, - DIGCF_PRESENT | (*IsUnknown ? DIGCF_ALLCLASSES : 0)); - if (hDevInfo == INVALID_HANDLE_VALUE) - { - return 0; - } - - KeyClass = SetupDiOpenClassRegKeyEx(&ClassGuid, + CONFIGRET cr; + + for (ulClassIndex = 0; ; ulClassIndex++) + { + cr = CM_Enumerate_Classes(ulClassIndex, + &ClassGuid, + 0); + if (cr == CR_NO_SUCH_VALUE) + return ulClassIndex; + } +} + + +static +PDEVCLASS_ENTRY +GetClassFromClassGuid( + PDEVCLASS_ENTRY pClassArray, + ULONG ulClassCount, + GUID *pGuid) +{ + PDEVCLASS_ENTRY pClass, pUnknownClass = NULL; + ULONG i; + + for (i = 0; i < ulClassCount; i++) + { + pClass = &pClassArray[i]; + + if (IsEqualGUID(&pClass->ClassGuid, &GUID_DEVCLASS_UNKNOWN)) + pUnknownClass = pClass; + + if (IsEqualGUID(&pClass->ClassGuid, pGuid)) + return pClass; + } + + return pUnknownClass; +} + + +static +VOID +EnumDeviceClasses( + HWND hTreeView, + HTREEITEM hRoot, + PDEVCLASS_ENTRY pClassArray, + ULONG ClassCount) +{ + WCHAR ClassName[MAX_DEV_LEN]; + WCHAR ClassDesc[MAX_DEV_LEN]; + PDEVCLASS_ENTRY pClass; + ULONG ClassIndex; + DWORD dwSize; + LONG lSize; + HKEY hKey; + CONFIGRET cr; + + for (ClassIndex = 0; ClassIndex < ClassCount; ClassIndex++) + { + pClass = &pClassArray[ClassIndex]; + + cr = CM_Enumerate_Classes(ClassIndex, + &pClass->ClassGuid, + 0); + if (cr == CR_NO_SUCH_VALUE) + return; + + dwSize = MAX_CLASS_NAME_LEN; + if (!SetupDiClassNameFromGuid(&pClass->ClassGuid, + ClassName, + dwSize, + &dwSize)) + { + ClassName[0] = _T('\0'); + } + + if (!SetupDiGetClassImageIndex(&ImageListData, + &pClass->ClassGuid, + &pClass->ClassImage)) + { + /* FIXME: can we do this? + * Set the blank icon: IDI_SETUPAPI_BLANK = 41 + * it'll be image 24 in the imagelist */ + pClass->ClassImage = 24; + } + + hKey = SetupDiOpenClassRegKeyEx(&pClass->ClassGuid, MAXIMUM_ALLOWED, DIOCR_INSTALLER, NULL, 0); - if (KeyClass != INVALID_HANDLE_VALUE) - { - - LONG dwSize = MAX_DEV_LEN; - - if (RegQueryValue(KeyClass, - NULL, - DevClassDesc, - &dwSize) != ERROR_SUCCESS) - { - *DevClassDesc = _T('\0'); - } - } - else - { - return 0; - } - - *DevPresent = TRUE; - - RegCloseKey(KeyClass); - - return 0; -} - - -static LONG -EnumDevices(INT index, - LPTSTR DeviceClassName, - LPTSTR DeviceName, - LPTSTR *DeviceID) -{ + if (hKey != INVALID_HANDLE_VALUE) + { + lSize = MAX_DEV_LEN; + if (RegQueryValue(hKey, + NULL, + ClassDesc, + &lSize) != ERROR_SUCCESS) + { + ClassDesc[0] = _T('\0'); + } + + RegCloseKey(hKey); + } + + pClass->hItem = InsertIntoTreeView(hTreeView, + hRoot, + (ClassDesc[0] != _T('\0')) ? ClassDesc : ClassName, + NULL, + pClass->ClassImage, + 0); + } +} + + +static +VOID +EnumDevices( + HWND hTreeView, + PDEVCLASS_ENTRY pClassArray, + ULONG ulClassCount, + BOOL bShowHidden) +{ + HDEVINFO hDevInfo = INVALID_HANDLE_VALUE; SP_DEVINFO_DATA DeviceInfoData; + ULONG Status, Problem; + DWORD DevIdSize; + TCHAR DeviceName[MAX_DEV_LEN]; + DWORD DevIndex; + LPTSTR InstanceId; + PDEVCLASS_ENTRY pClass; + UINT OverlayImage; CONFIGRET cr; - ULONG Status, ProblemNumber; - DWORD DevIdSize; - - *DeviceName = _T('\0'); - *DeviceID = NULL; - - ZeroMemory(&DeviceInfoData, sizeof(SP_DEVINFO_DATA)); - DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - - if (!SetupDiEnumDeviceInfo(hDevInfo, - index, - &DeviceInfoData)) - { - /* no such device */ - return -1; - } - - if (DeviceClassName == NULL && !IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_NULL)) - { - /* we're looking for unknown devices and this isn't one */ - return -2; - } - - /* 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) + + + /* Get device info for all devices of a particular class */ + hDevInfo = SetupDiGetClassDevs(NULL, + NULL, + NULL, + DIGCF_PRESENT | DIGCF_ALLCLASSES); + if (hDevInfo == INVALID_HANDLE_VALUE) + return; + + for (DevIndex = 0; ; DevIndex++) + { + ZeroMemory(&DeviceInfoData, sizeof(SP_DEVINFO_DATA)); + DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + + InstanceId = NULL; + DeviceName[0] = _T('\0'); + OverlayImage = 0; + + if (!SetupDiEnumDeviceInfo(hDevInfo, + DevIndex, + &DeviceInfoData)) + break; + + if (bShowHidden == FALSE && + (IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) || + IsEqualGUID(&DeviceInfoData.ClassGuid, &GUID_DEVCLASS_VOLUME))) + continue; + + pClass = GetClassFromClassGuid(pClassArray, + ulClassCount, + &DeviceInfoData.ClassGuid); + + /* get the device ID */ + if (!SetupDiGetDeviceInstanceId(hDevInfo, + &DeviceInfoData, + NULL, + 0, + &DevIdSize)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { - if (!SetupDiGetDeviceInstanceId(hDevInfo, - &DeviceInfoData, - *DeviceID, - DevIdSize, - NULL)) + InstanceId = (LPTSTR)HeapAlloc(GetProcessHeap(), + 0, + DevIdSize * sizeof(TCHAR)); + if (InstanceId != NULL) { - HeapFree(GetProcessHeap(), - 0, - *DeviceID); - *DeviceID = NULL; + if (!SetupDiGetDeviceInstanceId(hDevInfo, + &DeviceInfoData, + InstanceId, + DevIdSize, + NULL)) + { + HeapFree(GetProcessHeap(), + 0, + InstanceId); + InstanceId = NULL; + } } } } - } - - if (DeviceID != NULL && - _tcscmp(*DeviceID, _T("HTREE\\ROOT\\0")) == 0) - { - HeapFree(GetProcessHeap(), - 0, - *DeviceID); - *DeviceID = NULL; - return -1; - } - - /* get the device's friendly name */ - if (!SetupDiGetDeviceRegistryProperty(hDevInfo, - &DeviceInfoData, - SPDRP_FRIENDLYNAME, - 0, - (BYTE*)DeviceName, - MAX_DEV_LEN, - NULL)) - { - /* if the friendly name fails, try the description instead */ - SetupDiGetDeviceRegistryProperty(hDevInfo, - &DeviceInfoData, - SPDRP_DEVICEDESC, - 0, - (BYTE*)DeviceName, - MAX_DEV_LEN, - NULL); - } - - cr = CM_Get_DevNode_Status_Ex(&Status, - &ProblemNumber, - DeviceInfoData.DevInst, - 0, - NULL); - if (cr == CR_SUCCESS && (Status & DN_HAS_PROBLEM)) - { - return ProblemNumber; - } - - return 0; + + /* Skip the root device */ + if (InstanceId != NULL && + _tcscmp(InstanceId, _T("HTREE\\ROOT\\0")) == 0) + { + HeapFree(GetProcessHeap(), + 0, + InstanceId); + InstanceId = NULL; + continue; + } + + /* Get the device's friendly name */ + if (!SetupDiGetDeviceRegistryProperty(hDevInfo, + &DeviceInfoData, + SPDRP_FRIENDLYNAME, + 0, + (BYTE*)DeviceName, + MAX_DEV_LEN, + NULL)) + { + /* If the friendly name fails, try the description instead */ + SetupDiGetDeviceRegistryProperty(hDevInfo, + &DeviceInfoData, + SPDRP_DEVICEDESC, + 0, + (BYTE*)DeviceName, + MAX_DEV_LEN, + NULL); + } + + cr = CM_Get_DevNode_Status_Ex(&Status, + &Problem, + DeviceInfoData.DevInst, + 0, + NULL); + if ((cr == CR_SUCCESS) && + (Status & DN_HAS_PROBLEM)) + { + if (Problem == CM_PROB_DISABLED || + Problem == CM_PROB_HARDWARE_DISABLED) + OverlayImage = 2; + else + OverlayImage = 1; + } + + InsertIntoTreeView(hTreeView, + pClass->hItem, + DeviceName, + InstanceId, + pClass->ClassImage, + OverlayImage); + + if (OverlayImage != 0) + { + /* Expand the class if the device has a problem */ + (void)TreeView_Expand(hTreeView, + pClass->hItem, + TVE_EXPAND); + } + + pClass->bUsed = TRUE; + } + + if (hDevInfo != INVALID_HANDLE_VALUE) + SetupDiDestroyDeviceInfoList(hDevInfo); +} + + +static +VOID +CleanupDeviceClasses( + HWND hTreeView, + PDEVCLASS_ENTRY pClassArray, + ULONG ulClassCount) +{ + PDEVCLASS_ENTRY pClass; + ULONG i; + + for (i = 0; i < ulClassCount; i++) + { + pClass = &pClassArray[i]; + + if (pClass->bUsed == FALSE) + (void)TreeView_DeleteItem(hTreeView, + pClass->hItem); + else + (void)TreeView_SortChildren(hTreeView, + pClass->hItem, + 0); + } } @@ -353,105 +429,33 @@ HTREEITEM hRoot, BOOL bShowHidden) { - HTREEITEM hDevItem; - TCHAR DevName[MAX_DEV_LEN]; - TCHAR DevDesc[MAX_DEV_LEN]; - LPTSTR DeviceID = NULL; - BOOL DevExist = FALSE; - INT ClassRet; - INT index = 0; - INT DevImage; - BOOL IsUnknown = FALSE; - BOOL IsHidden = FALSE; - - do - { - ClassRet = EnumDeviceClasses(index, - bShowHidden, - DevName, - DevDesc, - &DevExist, - &DevImage, - &IsUnknown, - &IsHidden); - - if ((ClassRet != -1) && (DevExist) && !IsHidden) - { - TCHAR DeviceName[MAX_DEV_LEN]; - INT DevIndex = 0; - LONG Ret; - - if (DevDesc[0] != _T('\0')) - { - hDevItem = InsertIntoTreeView(hTreeView, - hRoot, - DevDesc, - NULL, - DevImage, - 0); - } - else - { - hDevItem = InsertIntoTreeView(hTreeView, - hRoot, - DevName, - NULL, - DevImage, - 0); - } - - do - { - Ret = EnumDevices(DevIndex, - IsUnknown ? NULL : DevName, - DeviceName, - &DeviceID); - if (Ret >= 0) - { - InsertIntoTreeView(hTreeView, - hDevItem, - DeviceName, - DeviceID, - DevImage, - Ret); - if (Ret != 0) - { - /* Expand the class if the device has a problem */ - (void)TreeView_Expand(hTreeView, - hDevItem, - TVE_EXPAND); - } - } - - DevIndex++; - - } while (Ret != -1); - - /* kill InfoList initialized in EnumDeviceClasses */ - if (hDevInfo) - { - SetupDiDestroyDeviceInfoList(hDevInfo); - hDevInfo = NULL; - } - - /* don't insert classes with no devices */ - if (!TreeView_GetChild(hTreeView, - hDevItem)) - { - (void)TreeView_DeleteItem(hTreeView, - hDevItem); - } - else - { - (void)TreeView_SortChildren(hTreeView, - hDevItem, - 0); - } - } - - index++; - - } while (ClassRet != -1); + PDEVCLASS_ENTRY pClassArray; + ULONG ulClassCount; + + ulClassCount = GetClassCount(); + + pClassArray = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + ulClassCount * sizeof(DEVCLASS_ENTRY)); + if (pClassArray == NULL) + return; + + EnumDeviceClasses(hTreeView, + hRoot, + pClassArray, + ulClassCount); + + EnumDevices(hTreeView, + pClassArray, + ulClassCount, + bShowHidden); + + CleanupDeviceClasses(hTreeView, + pClassArray, + ulClassCount); + + if (pClassArray != NULL) + HeapFree(GetProcessHeap(), 0, pClassArray); (void)TreeView_Expand(hTreeView, hRoot, @@ -647,25 +651,15 @@ InitTreeView(HWND hTreeView) { HTREEITEM hRoot; - HBITMAP hComp; TCHAR ComputerName[MAX_PATH]; DWORD dwSize = MAX_PATH; INT RootImage; (void)TreeView_DeleteAllItems(hTreeView); - /* get the device image List */ + /* Get the device image list */ ImageListData.cbSize = sizeof(ImageListData); SetupDiGetClassImageList(&ImageListData); - - hComp = LoadBitmap(hInstance, - MAKEINTRESOURCE(IDB_ROOT_IMAGE)); - - ImageList_Add(ImageListData.ImageList, - hComp, - NULL); - - DeleteObject(hComp); (void)TreeView_SetImageList(hTreeView, ImageListData.ImageList, @@ -677,9 +671,12 @@ ComputerName[0] = _T('\0'); } - RootImage = ImageList_GetImageCount(ImageListData.ImageList) - 1; - - /* insert the root item into the tree */ + /* Get the image index of the computer class */ + SetupDiGetClassImageIndex(&ImageListData, + &GUID_DEVCLASS_COMPUTER, + &RootImage); + + /* Insert the root item into the tree */ hRoot = InsertIntoTreeView(hTreeView, NULL, ComputerName, Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Sun Oct 5 08:53:51 2014 @@ -44,6 +44,15 @@ UINT InMenuLoop : 1; } MAIN_WND_INFO, *PMAIN_WND_INFO; + + +typedef struct _DEVCLASS_ENTRY +{ + GUID ClassGuid; + INT ClassImage; + BOOL bUsed; + HTREEITEM hItem; +} DEVCLASS_ENTRY, *PDEVCLASS_ENTRY; INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs