[ros-diffs] [gedmurphy] 69335: [DEVMGR] List devices without names as 'Unknown Device'

Author: gedmurphy
Date: Wed Sep 23 21:24:06 2015
New Revision: 69335

URL: http://svn.reactos.org/svn/reactos?rev=69335&view=rev
Log:
[DEVMGR]
List devices without names as 'Unknown Device'

Modified:
    trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt
    trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp
    trunk/reactos/dll/win32/devmgr_new/stdafx.h

Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt	[iso-8859-1] Wed Sep 23 21:24:06
2015
@@ -5,8 +5,8 @@
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/dll
-	${REACTOS_SOURCE_DIR}/lib/atl 
-	includes)
+    ${REACTOS_SOURCE_DIR}/lib/atl 
+    includes)
 
 list(APPEND SOURCE
     stdafx.h

Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp	[iso-8859-1] Wed Sep 23
21:24:06 2015
@@ -116,6 +116,7 @@
                               &m_ClassGuid,
                               &m_ClassImage);
 
+
     // Get the description for the device
     ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR);
     cr = CM_Get_DevNode_Registry_PropertyW(m_DevInst,
@@ -136,11 +137,11 @@
 
     }
 
-    // Cleanup if something failed
     if (cr != CR_SUCCESS)
     {
-        Cleanup();
-        return false;
+        CAtlStringW str;
+        if (str.LoadStringW(g_hThisInstance, IDS_UNKNOWNDEVICE))
+            StringCchCopyW(m_DisplayName, MAX_PATH, str.GetBuffer());
     }
 
     return true;

Modified: trunk/reactos/dll/win32/devmgr_new/stdafx.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/stdaf…
==============================================================================
--- trunk/reactos/dll/win32/devmgr_new/stdafx.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr_new/stdafx.h	[iso-8859-1] Wed Sep 23 21:24:06 2015
@@ -24,6 +24,8 @@
 
 #define ERR printf
 #define FIXME printf
+#define UNIMPLEMENTED
+#define WINE_DEFAULT_DEBUG_CHANNEL(t)
 
 DWORD WINAPI pSetupGuidFromString(PCWSTR pString, LPGUID lpGUID);