Author: gedmurphy
Date: Thu Sep 24 07:30:08 2015
New Revision: 69346

URL: http://svn.reactos.org/svn/reactos?rev=69346&view=rev
Log:
Revert back to the old devmgr I'll install gcc and reapply the changes tonight.
Apologies for the spam

Added:
    trunk/reactos/dll/win32/devmgr/advprop.c
      - copied unchanged from r69335, trunk/reactos/dll/win32/devmgr/advprop.c
    trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h
      - copied unchanged from r69335, 
trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h
    trunk/reactos/dll/win32/devmgr/devmgmt/lang/
      - copied from r69335, trunk/reactos/dll/win32/devmgr/devmgmt/lang/
    trunk/reactos/dll/win32/devmgr/devmgmt/res/
      - copied from r69335, trunk/reactos/dll/win32/devmgr/devmgmt/res/
    trunk/reactos/dll/win32/devmgr/devmgmt/rsrc.rc
      - copied unchanged from r69335, 
trunk/reactos/dll/win32/devmgr/devmgmt/rsrc.rc
    trunk/reactos/dll/win32/devmgr/devmgmt/stdafx.h
      - copied unchanged from r69335, 
trunk/reactos/dll/win32/devmgr/devmgmt/stdafx.h
    trunk/reactos/dll/win32/devmgr/devprblm.c
      - copied unchanged from r69335, trunk/reactos/dll/win32/devmgr/devprblm.c
    trunk/reactos/dll/win32/devmgr/hwpage.c
      - copied unchanged from r69335, trunk/reactos/dll/win32/devmgr/hwpage.c
    trunk/reactos/dll/win32/devmgr/hwresource.c
      - copied unchanged from r69335, 
trunk/reactos/dll/win32/devmgr/hwresource.c
    trunk/reactos/dll/win32/devmgr/misc.c
      - copied unchanged from r69335, trunk/reactos/dll/win32/devmgr/misc.c
    trunk/reactos/dll/win32/devmgr/precomp.h
      - copied unchanged from r69335, trunk/reactos/dll/win32/devmgr/precomp.h
    trunk/reactos/dll/win32/devmgr/resources/devmgr.ico
      - copied unchanged from r69335, 
trunk/reactos/dll/win32/devmgr/resources/devmgr.ico
    trunk/reactos/dll/win32/devmgr/stubs.c
      - copied unchanged from r69335, trunk/reactos/dll/win32/devmgr/stubs.c
    trunk/reactos/dll/win32/devmgr_new/
      - copied from r69335, trunk/reactos/dll/win32/devmgr_new/
Removed:
    trunk/reactos/dll/win32/devmgr/api.cpp
    trunk/reactos/dll/win32/devmgr/includes/
    trunk/reactos/dll/win32/devmgr/properties/
    trunk/reactos/dll/win32/devmgr/resources/computer.ico
    trunk/reactos/dll/win32/devmgr/resources/root.bmp
    trunk/reactos/dll/win32/devmgr/resources/toolbar.bmp
    trunk/reactos/dll/win32/devmgr/stdafx.h
Modified:
    trunk/reactos/dll/win32/CMakeLists.txt
    trunk/reactos/dll/win32/devmgr/   (props changed)
    trunk/reactos/dll/win32/devmgr/CMakeLists.txt
    trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp
    trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp
    trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp
    trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h
    trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp
    trunk/reactos/dll/win32/devmgr/devmgmt/devmgmt.h
    trunk/reactos/dll/win32/devmgr/devmgr.rc
    trunk/reactos/dll/win32/devmgr/lang/en-US.rc
    trunk/reactos/dll/win32/devmgr/resource.h

Modified: trunk/reactos/dll/win32/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/CMakeLists.txt      [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/CMakeLists.txt      [iso-8859-1] Thu Sep 24 
07:30:08 2015
@@ -34,7 +34,7 @@
 add_subdirectory(cryptui)
 add_subdirectory(dbghelp)
 add_subdirectory(dciman32)
-#add_subdirectory(devmgr)
+add_subdirectory(devmgr)
 add_subdirectory(dhcpcsvc)
 add_subdirectory(dnsapi)
 add_subdirectory(dwmapi)

Propchange: trunk/reactos/dll/win32/devmgr/
------------------------------------------------------------------------------
--- bugtraq:logregex    (original)
+++ bugtraq:logregex    (removed)
@@ -1 +0,0 @@
-((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or 
)?((CORE|ROSTESTS|ROSAPPS)-\d+))?

Propchange: trunk/reactos/dll/win32/devmgr/
------------------------------------------------------------------------------
--- bugtraq:message     (original)
+++ bugtraq:message     (removed)
@@ -1 +0,0 @@
-See issue %BUGID% for more details.

Propchange: trunk/reactos/dll/win32/devmgr/
------------------------------------------------------------------------------
--- bugtraq:url (original)
+++ bugtraq:url (removed)
@@ -1 +0,0 @@
-https://jira.reactos.org/browse/%BUGID%

Propchange: trunk/reactos/dll/win32/devmgr/
------------------------------------------------------------------------------
--- svn:ignore  (added)
+++ svn:ignore  Thu Sep 24 07:30:08 2015
@@ -0,0 +1,7 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln

Propchange: trunk/reactos/dll/win32/devmgr/
------------------------------------------------------------------------------
--- tsvn:logminsize     (original)
+++ tsvn:logminsize     (removed)
@@ -1 +0,0 @@
-10

Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/CMakeLists.txt?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/CMakeLists.txt       [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/CMakeLists.txt       [iso-8859-1] Thu Sep 24 
07:30:08 2015
@@ -1,27 +1,15 @@
 
 spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB)
 
-set_cpp(WITH_RTTI WITH_RUNTIME)
-
-include_directories(
-    ${REACTOS_SOURCE_DIR}/include/reactos/dll
-    ${REACTOS_SOURCE_DIR}/lib/atl 
-    includes)
-
 list(APPEND SOURCE
-    stdafx.h
-    api.cpp
-    properties/advprop.cpp
-    properties/devprblm.cpp
-    properties/hwpage.cpp
-    properties/hwresource.cpp
-    properties/misc.cpp
-    devmgmt/ClassNode.cpp
-    devmgmt/DeviceNode.cpp
-    devmgmt/DeviceView.cpp
-    devmgmt/MainWindow.cpp
-    devmgmt/Node.cpp
-    devmgmt/RootNode.cpp)
+    advprop.c
+    devprblm.c
+    hwpage.c
+    hwresource.c
+    misc.c
+    stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/devmgr_stubs.c)
 
 add_library(devmgr SHARED
     ${SOURCE}
@@ -29,7 +17,7 @@
     ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def)
 
 set_module_type(devmgr win32dll UNICODE)
-target_link_libraries(devmgr uuid atlnew wine)
-add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version 
msvcrt kernel32 ole32 uxtheme ntdll)
-add_pch(devmgr stdafx.h SOURCE)
+target_link_libraries(devmgr uuid wine)
+add_importlibs(devmgr setupapi advapi32 newdev user32 version msvcrt kernel32 
ntdll)
+add_pch(devmgr precomp.h SOURCE)
 add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all)

Removed: trunk/reactos/dll/win32/devmgr/api.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/api.cpp?rev=69345
==============================================================================
--- trunk/reactos/dll/win32/devmgr/api.cpp      [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/api.cpp      (removed)
@@ -1,309 +0,0 @@
-/*
-*
-* COPYRIGHT:       See COPYING in the top level directory
-* PROJECT:         ReactOS devmgr.dll
-* FILE:            lib/devmgr/stubs.c
-* PURPOSE:         devmgr.dll stubs
-* PROGRAMMER:      Thomas Weidenmueller ([email protected])
-*                  Ged Murphy ([email protected])
-* NOTES:           
-*                  Some helpful resources:
-*                    
http://support.microsoft.com/default.aspx?scid=kb;%5BLN%5D;815320
-*                    http://www.jsiinc.com/SUBO/tip7400/rh7482.htm
-*                    http://www.jsiinc.com/SUBM/tip6400/rh6490.htm
-*
-* UPDATE HISTORY:
-*      04-04-2004  Created
-*/
-
-#include "stdafx.h"
-#include "devmgmt\MainWindow.h"
-
-HINSTANCE hDllInstance = NULL;
-
-WINE_DEFAULT_DEBUG_CHANNEL(devmgr);
-
-
-/***************************************************************************
-* NAME                                                         EXPORTED
-*      DeviceManager_ExecuteA
-*
-* DESCRIPTION
-*   Starts the Device Manager
-*
-* ARGUMENTS
-*   hWndParent:   Handle to the parent window
-*   hInst:        Handle to the application instance
-*   lpMachineName: Machine Name, NULL is the local machine
-*   nCmdShow:      Specifies how the window should be shown
-*
-* RETURN VALUE
-*   TRUE:  if no errors occured
-*   FALSE: if the device manager could not be executed
-*
-* REVISIONS
-*
-* NOTE
-*   - Win runs the device manager in a separate process, so hWndParent is 
somehow
-*     obsolete.
-*
-* @unimplemented
-*/
-BOOL
-WINAPI
-DeviceManager_ExecuteA(HWND hWndParent,
-                       HINSTANCE hInst,
-                       LPCSTR lpMachineName,
-                       int nCmdShow)
-{
-    UNIMPLEMENTED;
-    return FALSE;
-}
-
-
-/***************************************************************************
-* NAME                                                         EXPORTED
-*      DeviceManager_ExecuteW
-*
-* DESCRIPTION
-*   Starts the Device Manager
-*
-* ARGUMENTS
-*   hWndParent:   Handle to the parent window
-*   hInst:        Handle to the application instance
-*   lpMachineName: Machine Name, NULL is the local machine
-*   nCmdShow:      Specifies how the window should be shown
-*
-* RETURN VALUE
-*   TRUE:  if no errors occured
-*   FALSE: if the device manager could not be executed
-*
-* REVISIONS
-*
-* NOTE
-*   - Win runs the device manager in a separate process, so hWndParent is 
somehow
-*     obsolete.
-*
-* @unimplemented
-*/
-BOOL
-WINAPI
-DeviceManager_ExecuteW(HWND hWndParent,
-                       HINSTANCE hInst,
-                       LPCWSTR lpMachineName,
-                       int nCmdShow)
-{
-    // FIXME: Call mmc with devmgmt.msc
-
-    CDeviceManager DevMgr;
-    return DevMgr.Create(hWndParent, hInst, lpMachineName, nCmdShow);
-}
-
-
-/***************************************************************************
-* NAME                                                         EXPORTED
-*      DeviceProblemWizard_RunDLLA
-*
-* DESCRIPTION
-*   Calls the device problem wizard
-*
-* ARGUMENTS
-*   hWndParent:  Handle to the parent window
-*   hInst:       Handle to the application instance
-*   lpDeviceCmd: A command that includes the DeviceID of the properties to be 
shown,
-*                also see NOTEs
-*   nCmdShow:    Specifies how the window should be shown
-*
-* RETURN VALUE
-*
-* REVISIONS
-*
-* NOTE
-*   - Win XP exports this function as DeviceProblenWizard_RunDLLA, apparently 
it's
-*     a typo so we additionally export an alias function
-*   - lpDeviceCmd is a string in the form of "/MachineName MACHINE /DeviceID 
DEVICEPATH"
-*     (/MachineName is optional). This function only parses this string and 
eventually
-*     calls DeviceProperties().
-*
-* @unimplemented
-*/
-VOID
-WINAPI
-DeviceProblemWizard_RunDLLA(HWND hWndParent,
-                            HINSTANCE hInst,
-                            LPCSTR lpDeviceCmd,
-                            int nCmdShow)
-{
-    UNIMPLEMENTED;
-}
-
-
-/***************************************************************************
-* NAME                                                         EXPORTED
-*      DeviceProblemWizard_RunDLLW
-*
-* DESCRIPTION
-*   Calls the device problem wizard
-*
-* ARGUMENTS
-*   hWndParent:  Handle to the parent window
-*   hInst:       Handle to the application instance
-*   lpDeviceCmd: A command that includes the DeviceID of the properties to be 
shown,
-*                also see NOTEs
-*   nCmdShow:    Specifies how the window should be shown
-*
-* RETURN VALUE
-*
-* REVISIONS
-*
-* NOTE
-*   - Win XP exports this function as DeviceProblenWizard_RunDLLA, apparently 
it's
-*     a typo so we additionally export an alias function
-*   - lpDeviceCmd is a string in the form of "/MachineName MACHINE /DeviceID 
DEVICEPATH"
-*     (/MachineName is optional). This function only parses this string and 
eventually
-*     calls DeviceProperties().
-*
-* @unimplemented
-*/
-VOID
-WINAPI
-DeviceProblemWizard_RunDLLW(HWND hWndParent,
-                            HINSTANCE hInst,
-                            LPCWSTR lpDeviceCmd,
-                            int nCmdShow)
-{
-    UNIMPLEMENTED;
-}
-
-
-/***************************************************************************
-* NAME                                                         EXPORTED
-*      DeviceManagerPrintA
-*
-* DESCRIPTION
-*   Calls the device problem wizard
-*
-* ARGUMENTS
-*   lpMachineName:  Machine Name, NULL is the local machine
-*   lpPrinter:      Filename of the printer where it should be printed on
-*   nPrintMode:     Specifies what kind of information is to be printed
-*                     DEV_PRINT_ABSTRACT: Prints an abstract of system 
information, the parameters
-*                                         uNumberOfGuids, Guids are ignored
-*                     DEV_PRINT_SELECTED: Prints information about the devices 
listed in Guids
-*                     DEV_PRINT_ALL:      Prints an abstract of system 
information and all
-*                                         system devices
-*   uNumberOfGuids: Numbers of guids in the Guids array, this parameter is 
ignored unless
-*                   nPrintMode is DEV_PRINT_SELECTED
-*   lpGuids:        Array of device guids, this parameter is ignored unless
-*                   nPrintMode is DEV_PRINT_SELECTED
-*
-* RETURN VALUE
-*   TRUE:  if no errors occured
-*   FALSE: if errors occured
-*
-* REVISIONS
-*
-* NOTE
-*
-* @unimplemented
-*/
-BOOL
-WINAPI
-DeviceManagerPrintA(LPCSTR lpMachineName,
-                    LPCSTR lpPrinter,
-                    int nPrintMode,
-                    UINT uNumberOfGuids,
-                    LPGUID lpGuids)
-{
-    UNIMPLEMENTED;
-    return FALSE;
-}
-
-
-/***************************************************************************
-* NAME                                                         EXPORTED
-*      DeviceManagerPrintW
-*
-* DESCRIPTION
-*   Calls the device problem wizard
-*
-* ARGUMENTS
-*   lpMachineName:  Machine Name, NULL is the local machine
-*   lpPrinter:      Filename of the printer where it should be printed on
-*   nPrintMode:     Specifies what kind of information is to be printed
-*                     DEV_PRINT_ABSTRACT: Prints an abstract of system 
information, the parameters
-*                                         uNumberOfGuids, Guids are ignored
-*                     DEV_PRINT_SELECTED: Prints information about the devices 
listed in Guids
-*                     DEV_PRINT_ALL:      Prints an abstract of system 
information and all
-*                                         system devices
-*   uNumberOfGuids: Numbers of guids in the Guids array, this parameter is 
ignored unless
-*                   nPrintMode is DEV_PRINT_SELECTED
-*   lpGuids:        Array of device guids, this parameter is ignored unless
-*                   nPrintMode is DEV_PRINT_SELECTED
-*
-* RETURN VALUE
-*   TRUE:  if no errors occured
-*   FALSE: if errors occured
-*
-* REVISIONS
-*
-* NOTE
-*
-* @unimplemented
-*/
-BOOL
-WINAPI
-DeviceManagerPrintW(LPCWSTR lpMachineName,
-                    LPCWSTR lpPrinter,
-                    int nPrintMode,
-                    UINT uNumberOfGuids,
-                    LPGUID lpGuids)
-{
-    UNIMPLEMENTED;
-    return FALSE;
-}
-
-
-BOOL
-WINAPI
-DllMain(IN HINSTANCE hinstDLL,
-IN DWORD dwReason,
-IN LPVOID lpvReserved)
-{
-    switch (dwReason)
-    {
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hinstDLL);
-            hDllInstance = hinstDLL;
-            break;
-    }
-
-    return TRUE;
-}
-
-class CDevMgrUIModule : public CComModule
-{
-public:
-};
-
-CDevMgrUIModule gModule;
-
-STDAPI DllCanUnloadNow()
-{
-    return gModule.DllCanUnloadNow();
-}
-
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
-{
-    return gModule.DllGetClassObject(rclsid, riid, ppv);
-}
-
-STDAPI DllRegisterServer()
-{
-    return gModule.DllRegisterServer(FALSE);
-}
-
-STDAPI DllUnregisterServer()
-{
-    return gModule.DllUnregisterServer(FALSE);
-}

Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp       [iso-8859-1] 
(original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp       [iso-8859-1] 
Thu Sep 24 07:30:08 2015
@@ -116,7 +116,6 @@
                               &m_ClassGuid,
                               &m_ClassImage);
 
-
     // Get the description for the device
     ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR);
     cr = CM_Get_DevNode_Registry_PropertyW(m_DevInst,
@@ -137,11 +136,11 @@
 
     }
 
+    // Cleanup if something failed
     if (cr != CR_SUCCESS)
     {
-        CAtlStringW str;
-        if (str.LoadStringW(g_hThisInstance, IDS_UNKNOWNDEVICE))
-            StringCchCopyW(m_DisplayName, MAX_PATH, str.GetBuffer());
+        Cleanup();
+        return false;
     }
 
     return true;

Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp       [iso-8859-1] 
(original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp       [iso-8859-1] 
Thu Sep 24 07:30:08 2015
@@ -78,7 +78,7 @@
                                   0, 0, 0, 0,
                                   m_hMainWnd,
                                   (HMENU)IDC_TREEVIEW,
-                                  g_hThisInstance,
+                                  g_hInstance,
                                   NULL);
     if (m_hTreeView)
     {
@@ -204,7 +204,7 @@
     m_ViewType = Type;
 
     RefreshThreadData *ThreadData;
-    ThreadData = new RefreshThreadData;
+    ThreadData = new RefreshThreadData();
     ThreadData->This = this;
     ThreadData->ScanForChanges = ScanForChanges;
     ThreadData->UpdateView = UpdateView;
@@ -222,10 +222,11 @@
     HANDLE hThread;
     hThread = (HANDLE)_beginthreadex(NULL,
                                      0,
-                                     RefreshThread,
+                                     &RefreshThread,
                                      ThreadData,
                                      0,
                                      NULL);
+
     if (hThread) CloseHandle(hThread);
 }
 
@@ -478,7 +479,7 @@
 
             // Get the cached class node
             ClassNode = GetClassNode(&ClassGuid);
-            if (ClassNode == nullptr)
+            if (ClassNode == NULL)
             {
                 ATLASSERT(FALSE);
                 ClassIndex++;
@@ -519,7 +520,7 @@
 
                     // Get the cached device node
                     DeviceNode = GetDeviceNode(DeviceInfoData.DevInst);
-                    if (DeviceNode == nullptr)
+                    if (DeviceNode == NULL)
                     {
                         ATLASSERT(bClassUnknown == true);
                         DeviceIndex++;
@@ -719,7 +720,7 @@
     if (Enable == false)
     {
         CAtlStringW str;
-        if (str.LoadStringW(g_hThisInstance, IDS_CONFIRM_DISABLE))
+        if (str.LoadStringW(g_hInstance, IDS_CONFIRM_DISABLE))
         {
             if (MessageBoxW(m_hMainWnd,
                 str,
@@ -840,7 +841,7 @@
 
         if (DeviceNode->CanUpdate())
         {
-            String.LoadStringW(g_hThisInstance, IDS_MENU_UPDATE);
+            String.LoadStringW(g_hInstance, IDS_MENU_UPDATE);
             MenuItemInfo.wID = IDC_UPDATE_DRV;
             MenuItemInfo.dwTypeData = String.GetBuffer();
             InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
@@ -849,7 +850,7 @@
 
         if (DeviceNode->IsDisabled())
         {
-            String.LoadStringW(g_hThisInstance, IDS_MENU_ENABLE);
+            String.LoadStringW(g_hInstance, IDS_MENU_ENABLE);
             MenuItemInfo.wID = IDC_ENABLE_DRV;
             MenuItemInfo.dwTypeData = String.GetBuffer();
             InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
@@ -858,7 +859,7 @@
 
         if (DeviceNode->CanDisable() && !DeviceNode->IsDisabled())
         {
-            String.LoadStringW(g_hThisInstance, IDS_MENU_DISABLE);
+            String.LoadStringW(g_hInstance, IDS_MENU_DISABLE);
             MenuItemInfo.wID = IDC_DISABLE_DRV;
             MenuItemInfo.dwTypeData = String.GetBuffer();
             InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
@@ -867,7 +868,7 @@
 
         if (DeviceNode->CanUninstall())
         {
-            String.LoadStringW(g_hThisInstance, IDS_MENU_UNINSTALL);
+            String.LoadStringW(g_hInstance, IDS_MENU_UNINSTALL);
             MenuItemInfo.wID = IDC_UNINSTALL_DRV;
             MenuItemInfo.dwTypeData = String.GetBuffer();
             InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
@@ -879,7 +880,7 @@
     }
 
     // All nodes have the scan option
-    String.LoadStringW(g_hThisInstance, IDS_MENU_SCAN);
+    String.LoadStringW(g_hInstance, IDS_MENU_SCAN);
     MenuItemInfo.wID = IDC_SCAN_HARDWARE;
     MenuItemInfo.dwTypeData = String.GetBuffer();
     InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
@@ -887,7 +888,7 @@
 
     if ((Node->GetNodeType() == RootNode) || (MainMenu == true))
     {
-        String.LoadStringW(g_hThisInstance, IDS_MENU_ADD);
+        String.LoadStringW(g_hInstance, IDS_MENU_ADD);
         MenuItemInfo.wID = IDC_ADD_HARDWARE;
         MenuItemInfo.dwTypeData = String.GetBuffer();
         InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
@@ -899,7 +900,7 @@
         InsertMenuItemW(OwnerMenu, i, TRUE, &MenuSeperator);
         i++;
 
-        String.LoadStringW(g_hThisInstance, IDS_MENU_PROPERTIES);
+        String.LoadStringW(g_hInstance, IDS_MENU_PROPERTIES);
         MenuItemInfo.wID = IDC_PROPERTIES;
         MenuItemInfo.dwTypeData = String.GetBuffer();
         InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
@@ -1020,14 +1021,13 @@
     CClassNode *Node;
 
     Pos = m_ClassNodeList.GetHeadPosition();
-    if (Pos == NULL) return nullptr;
 
     do
     {
         Node = m_ClassNodeList.GetNext(Pos);
         if (IsEqualGUID(*Node->GetClassGuid(), *ClassGuid))
         {
-            ATLASSERT(Node->GetNodeType() == ClassNode);
+            //ATLASSERT(Node->GetType() == NodeClass);
             break;
         }
 
@@ -1047,14 +1047,13 @@
     CDeviceNode *Node;
 
     Pos = m_DeviceNodeList.GetHeadPosition();
-    if (Pos == NULL) return nullptr;
 
     do
     {
         Node = m_DeviceNodeList.GetNext(Pos);
         if (Node->GetDeviceInst() == Device)
         {
-            ATLASSERT(Node->GetNodeType() == DeviceNode);
+            //ATLASSERT(Node->GetType() == NodeDevice);
             break;
         }
 
@@ -1113,7 +1112,6 @@
     if (m_RootNode) delete m_RootNode;
     m_RootNode = new CRootNode(&m_ImageListData);
     m_RootNode->SetupNode();
-
     // Loop through all the classes
     do
     {
@@ -1157,11 +1155,6 @@
         {
             m_DeviceNodeList.AddTail(DeviceNode);
         }
-        else
-        {
-            ATLASSERT(FALSE);
-        }
-
     }
 
     SetupDiDestroyDeviceInfoList(hDevInfo);

Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp       [iso-8859-1] 
(original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp       [iso-8859-1] 
Thu Sep 24 07:30:08 2015
@@ -21,8 +21,6 @@
 #define BTN_UPDATE_DRV      4
 #define BTN_UNINSTALL_DRV   5
 
-HINSTANCE g_hThisInstance = NULL;
-HINSTANCE g_hParentInstance = NULL;
 
 // menu hints
 static const MENU_HINT MainMenuHintTable[] =
@@ -77,7 +75,8 @@
 
 /* PUBLIC METHODS **********************************************/
 
-CDeviceManager::CDeviceManager(void) :
+CMainWindow::CMainWindow(void) :
+    m_ToolbarhImageList(NULL),
     m_hMainWnd(NULL),
     m_hStatusBar(NULL),
     m_hToolBar(NULL),
@@ -86,55 +85,15 @@
     m_szMainWndClass = L"DevMgmtWndClass";
 }
 
-CDeviceManager::~CDeviceManager(void)
-{
-}
-
+CMainWindow::~CMainWindow(void)
+{
+    // Destroy any previous list
+    if (m_ToolbarhImageList) ImageList_Destroy(m_ToolbarhImageList);
+}
 
 bool
-CDeviceManager::Create(_In_ HWND /*hWndParent*/,
-                       _In_ HINSTANCE hInst,
-                       _In_opt_z_ LPCWSTR /*lpMachineName*/,
-                       _In_ int nCmdShow)
-{
-    CDeviceManager MainWindow;
-    INITCOMMONCONTROLSEX icex;
-    CAtlStringW szAppName;
-    int Ret = 1;
-
-    // Store the instances
-    g_hParentInstance = hInst;
-    g_hThisInstance = GetModuleHandleW(L"devmgr.dll");
-
-    // Initialize common controls
-    icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
-    icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES;
-    InitCommonControlsEx(&icex);
-
-    // Load the application name
-    if (szAppName.LoadStringW(g_hThisInstance, IDS_APPNAME))
-    {
-        // Initialize the main window
-        if (MainWindow.Initialize(szAppName, nCmdShow))
-        {
-            // Run the application
-            Ret = MainWindow.Run();
-
-            // Uninitialize the main window
-            MainWindow.Uninitialize();
-        }
-    }
-
-    return (Ret == 0);
-}
-
-
-
-/* PRIVATE METHODS **********************************************/
-
-bool
-CDeviceManager::Initialize(_In_z_ LPCTSTR lpCaption,
-                           _In_ int nCmdShow)
+CMainWindow::Initialize(LPCTSTR lpCaption,
+                        int nCmdShow)
 {
     CAtlStringW szCaption;
     WNDCLASSEXW wc = {0};
@@ -145,13 +104,13 @@
     // Setup the window class struct
     wc.cbSize = sizeof(WNDCLASSEXW);
     wc.lpfnWndProc = MainWndProc;
-    wc.hInstance = g_hThisInstance;
-    wc.hIcon = LoadIcon(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON));
+    wc.hInstance = g_hInstance;
+    wc.hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON));
     wc.hCursor = LoadCursor(NULL, IDC_ARROW);
     wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
     wc.lpszMenuName = MAKEINTRESOURCEW(IDR_MAINMENU);
     wc.lpszClassName = m_szMainWndClass;
-    wc.hIconSm = (HICON)LoadImage(g_hThisInstance,
+    wc.hIconSm = (HICON)LoadImage(g_hInstance,
                                   MAKEINTRESOURCE(IDI_MAIN_ICON),
                                   IMAGE_ICON,
                                   16,
@@ -172,7 +131,7 @@
                                      500,
                                      NULL,
                                      NULL,
-                                     g_hThisInstance,
+                                     g_hInstance,
                                      this);
     }
 
@@ -181,14 +140,14 @@
 }
 
 void
-CDeviceManager::Uninitialize(void)
+CMainWindow::Uninitialize()
 {
     // Unregister the window class 
-    UnregisterClassW(m_szMainWndClass, g_hThisInstance);
+    UnregisterClassW(m_szMainWndClass, g_hInstance);
 }
 
 int
-CDeviceManager::Run(void)
+CMainWindow::Run()
 {
     MSG Msg;
 
@@ -202,11 +161,14 @@
     return 0;
 }
 
+
+/* PRIVATE METHODS **********************************************/
+
 bool
-CDeviceManager::MainWndMenuHint(_In_ WORD CmdId,
-                                _In_ const MENU_HINT *HintArray,
-                                _In_ DWORD HintsCount,
-                                _In_ UINT DefHintId)
+CMainWindow::MainWndMenuHint(WORD CmdId,
+                             const MENU_HINT *HintArray,
+                             DWORD HintsCount,
+                             UINT DefHintId)
 {
     bool Found = false;
     const MENU_HINT *LastHint;
@@ -226,14 +188,16 @@
 
     StatusBarLoadString(m_hStatusBar,
                         SB_SIMPLEID,
-                        g_hThisInstance,
+                        g_hInstance,
                         HintId);
 
     return Found;
 }
 
 void
-CDeviceManager::UpdateStatusBar(_In_ bool InMenuLoop)
+CMainWindow::UpdateStatusBar(
+    _In_ bool InMenuLoop
+    )
 {
     SendMessageW(m_hStatusBar,
                  SB_SIMPLE,
@@ -242,7 +206,7 @@
 }
 
 bool
-CDeviceManager::RefreshView(_In_ ViewType Type)
+CMainWindow::RefreshView(ViewType Type)
 {
     UINT CheckId = 0;
     BOOL bSuccess;
@@ -271,7 +235,7 @@
 }
 
 bool
-CDeviceManager::CreateToolBar(void)
+CMainWindow::CreateToolBar()
 {
     TBADDBITMAP TbAddBitmap;
     INT Index;
@@ -287,7 +251,7 @@
                                  0, 0, 0, 0,
                                  m_hMainWnd,
                                  (HMENU)IDC_TOOLBAR,
-                                 g_hThisInstance,
+                                 g_hInstance,
                                  NULL);
     if (m_hToolBar == NULL) return FALSE;
 
@@ -305,7 +269,7 @@
                  sizeof(TBBUTTON),
                  0);
 
-    TbAddBitmap.hInst = g_hThisInstance;
+    TbAddBitmap.hInst = g_hInstance;
     TbAddBitmap.nID = IDB_TOOLBAR;
     Index = SendMessageW(m_hToolBar, TB_ADDBITMAP, _countof(TbButtons), 
(LPARAM)&TbAddBitmap);
 
@@ -321,7 +285,7 @@
 }
 
 bool
-CDeviceManager::CreateStatusBar(void)
+CMainWindow::CreateStatusBar()
 {
     int StatWidths[] = {110, -1}; // widths of status bar
     bool bRet = FALSE;
@@ -334,7 +298,7 @@
                                    0, 0, 0, 0,
                                    m_hMainWnd,
                                    (HMENU)IDC_STATUSBAR,
-                                   g_hThisInstance,
+                                   g_hInstance,
                                    NULL);
     if (m_hStatusBar)
     {
@@ -348,7 +312,7 @@
     return bRet;
 }
 
-void CDeviceManager::UpdateToolbar()
+void CMainWindow::UpdateToolbar()
 {
     WORD State;
 
@@ -403,10 +367,10 @@
 
 
 bool
-CDeviceManager::StatusBarLoadString(_In_ HWND hStatusBar,
-                                    _In_ INT PartId,
-                                    _In_ HINSTANCE hInstance,
-                                    _In_ UINT uID)
+CMainWindow::StatusBarLoadString(IN HWND hStatusBar,
+                                 IN INT PartId,
+                                 IN HINSTANCE hInstance,
+                                 IN UINT uID)
 {
     CAtlStringW szMessage;
     bool bRet = false;
@@ -425,7 +389,7 @@
 }
 
 LRESULT
-CDeviceManager::OnCreate(_In_ HWND hwnd)
+CMainWindow::OnCreate(HWND hwnd)
 {
     LRESULT RetCode;
 
@@ -458,7 +422,7 @@
 }
 
 LRESULT
-CDeviceManager::OnSize(void)
+CMainWindow::OnSize()
 {
     RECT rcClient, rcTool, rcStatus;
     INT lvHeight, iToolHeight, iStatusHeight;
@@ -493,7 +457,7 @@
 }
 
 LRESULT
-CDeviceManager::OnNotify(_In_ LPARAM lParam)
+CMainWindow::OnNotify(LPARAM lParam)
 {
     LPNMHDR NmHdr = (LPNMHDR)lParam;
     LRESULT Ret;
@@ -527,7 +491,6 @@
         case TTN_GETDISPINFO:
         {
              LPTOOLTIPTEXT lpttt = (LPTOOLTIPTEXT)lParam;
-             lpttt->hinst = g_hThisInstance;
 
             UINT_PTR idButton = lpttt->hdr.idFrom;
             switch (idButton)
@@ -539,19 +502,18 @@
                     lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_SCAN);
                     break;
                 case IDC_ENABLE_DRV:
-                    lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_ENABLE);
+                    lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ENABLE);
                     break;
                 case IDC_DISABLE_DRV:
-                    lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_DISABLE);
+                    lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_DISABLE);
                     break;
                 case IDC_UPDATE_DRV:
-                    lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_UPDATE);
+                    lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UPDATE);
                     break;
                 case IDC_UNINSTALL_DRV:
-                    lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_UNINSTALL);
+                    lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UNINSTALL);
                     break;
             }
-            idButton = idButton;
             break;
         }
     }
@@ -560,14 +522,14 @@
 }
 
 LRESULT
-CDeviceManager::OnContext(_In_ LPARAM lParam)
+CMainWindow::OnContext(LPARAM lParam)
 {
     return m_DeviceView->OnContextMenu(lParam);
 }
 
 LRESULT
-CDeviceManager::OnCommand(_In_ WPARAM wParam,
-                          _In_ LPARAM /*lParam*/)
+CMainWindow::OnCommand(WPARAM wParam,
+                       LPARAM /*lParam*/)
 {
     LRESULT RetCode = 0;
     WORD Msg;
@@ -679,7 +641,7 @@
 }
 
 LRESULT
-CDeviceManager::OnDestroy(void)
+CMainWindow::OnDestroy()
 {
     // Uninitialize the device view
     m_DeviceView->Uninitialize();
@@ -698,16 +660,16 @@
 }
 
 LRESULT CALLBACK
-CDeviceManager::MainWndProc(_In_ HWND hwnd,
-                            _In_ UINT msg,
-                            _In_ WPARAM wParam,
-                            _In_ LPARAM lParam)
-{
-    CDeviceManager *This;
+CMainWindow::MainWndProc(HWND hwnd,
+                         UINT msg,
+                         WPARAM wParam,
+                         LPARAM lParam)
+{
+    CMainWindow *This;
     LRESULT RetCode = 0;
 
     // Get the object pointer from window context
-    This = (CDeviceManager *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    This = (CMainWindow *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
     if (This == NULL)
     {
         // Check that this isn't a create message
@@ -723,7 +685,7 @@
         case WM_CREATE:
         {
             // Get the object pointer from the create param
-            This = (CDeviceManager *)((LPCREATESTRUCT)lParam)->lpCreateParams;
+            This = (CMainWindow *)((LPCREATESTRUCT)lParam)->lpCreateParams;
 
             // Store the pointer in the window's global user data
             SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)This);
@@ -819,3 +781,47 @@
 
     return RetCode;
 }
+
+
+//////// MOVE ME ////////////////
+
+HINSTANCE g_hInstance = NULL;
+HANDLE ProcessHeap = NULL;
+
+BOOL
+WINAPI
+DeviceManager_ExecuteW(HWND /*hWndParent*/,
+                       HINSTANCE hInst,
+                       LPCWSTR /*lpMachineName*/,
+                       int nCmdShow)
+{
+    CMainWindow MainWindow;
+    INITCOMMONCONTROLSEX icex;
+    CAtlStringW szAppName;
+    int Ret = 1;
+
+    // Store the global values
+    g_hInstance = hInst;
+    ProcessHeap = GetProcessHeap();
+
+    // Initialize common controls
+    icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
+    icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES;
+    InitCommonControlsEx(&icex);
+
+    // Load the application name
+    if (szAppName.LoadStringW(g_hInstance, IDS_APPNAME))
+    {
+        // Initialize the main window
+        if (MainWindow.Initialize(szAppName, nCmdShow))
+        {
+            // Run the application
+            Ret = MainWindow.Run();
+
+            // Uninitialize the main window
+            MainWindow.Uninitialize();
+        }
+    }
+
+    return Ret;
+}

Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Thu Sep 24 
07:30:08 2015
@@ -7,27 +7,25 @@
     UINT HintId;
 } MENU_HINT, *PMENU_HINT;
 
-class CDeviceManager
+class CMainWindow
 {
     CAtlStringW m_szMainWndClass;
     CDeviceView *m_DeviceView;
     HWND m_hMainWnd;
     HWND m_hStatusBar;
     HWND m_hToolBar;
+    HIMAGELIST m_ToolbarhImageList;
     HMENU m_hMenu;
     HMENU m_hActionMenu;
     int m_CmdShow;
 
 public:
-    CDeviceManager(void);
-    ~CDeviceManager(void);
+    CMainWindow(void);
+    ~CMainWindow(void);
 
-    bool Create(
-        _In_ HWND hWndParent,
-        _In_ HINSTANCE hInst,
-        _In_opt_z_ LPCWSTR lpMachineName,
-        _In_ int nCmdShow
-        );
+    bool Initialize(LPCTSTR lpCaption, int nCmdShow);
+    int Run();
+    void Uninitialize();
 
 private:
     static LRESULT CALLBACK MainWndProc(
@@ -37,44 +35,24 @@
         LPARAM lParam
         );
 
-    bool Initialize(
-        _In_z_ LPCTSTR lpCaption,
-        _In_ int nCmdShow
+    LRESULT OnCreate(HWND hwnd);
+    LRESULT OnDestroy();
+    LRESULT OnSize();
+    LRESULT OnNotify(LPARAM lParam);
+    LRESULT OnContext(LPARAM lParam);
+    LRESULT OnCommand(WPARAM wParam, LPARAM lParam);
+
+    bool CreateToolBar();
+    bool CreateStatusBar();
+
+    void UpdateToolbar(
         );
 
-    int Run();
-    void Uninitialize(void);
-
-    LRESULT OnCreate(
-        _In_ HWND hwnd
-        );
-
-    LRESULT OnDestroy(void);
-    LRESULT OnSize(void);
-
-    LRESULT OnNotify(
-        _In_ LPARAM lParam
-        );
-
-    LRESULT OnContext(
-        _In_ LPARAM lParam
-        );
-
-    LRESULT OnCommand(
-        _In_ WPARAM wParam,
-        LPARAM lParam
-        );
-
-    bool CreateToolBar(void);
-    bool CreateStatusBar(void);
-
-    void UpdateToolbar(void);
-
     bool StatusBarLoadString(
-        _In_ HWND hStatusBar,
-        _In_ INT PartId,
-        _In_ HINSTANCE hInstance,
-        _In_ UINT uID
+        HWND hStatusBar,
+        INT PartId,
+        HINSTANCE hInstance,
+        UINT uID
         );
 
     void UpdateStatusBar(
@@ -82,14 +60,14 @@
         );
 
     bool MainWndMenuHint(
-        _In_ WORD CmdId,
-        _In_ const MENU_HINT *HintArray,
-        _In_ DWORD HintsCount,
-        _In_ UINT DefHintId
+        WORD CmdId,
+        const MENU_HINT *HintArray,
+        DWORD HintsCount,
+        UINT DefHintId
         );
 
     bool RefreshView(
-        _In_ ViewType Type
+        ViewType Type
         );
 };
 

Modified: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] Thu Sep 24 
07:30:08 2015
@@ -29,8 +29,8 @@
 
     // Load the bitmap we'll be using as the root image
     HBITMAP hRootImage;
-    hRootImage = LoadBitmapW(g_hThisInstance,
-                             MAKEINTRESOURCEW(IDB_ROOT_IMAGE));
+    hRootImage = LoadBitmapW(g_hInstance,
+                                MAKEINTRESOURCEW(IDB_ROOT_IMAGE));
     if (hRootImage == NULL) return FALSE;
 
     // Add this bitmap to the device image list. This is a bit hacky, but it's 
safe

Modified: trunk/reactos/dll/win32/devmgr/devmgmt/devmgmt.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/devmgmt.h?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/devmgmt.h    [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/devmgmt.h    [iso-8859-1] Thu Sep 24 
07:30:08 2015
@@ -2,8 +2,8 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #pragma once
-#include "..\resource.h"
+#include "resource.h"
 
-extern HINSTANCE g_hThisInstance;
-extern HINSTANCE g_hParentInstance;
+extern HINSTANCE g_hInstance;
+extern HANDLE ProcessHeap;
 

Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgr.rc    [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgr.rc    [iso-8859-1] Thu Sep 24 
07:30:08 2015
@@ -4,23 +4,78 @@
 
 #include "resource.h"
 
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Device Manager"
 #define REACTOS_STR_INTERNAL_NAME     "devmgr"
 #define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll"
+#include <reactos/version.rc>
 
-//#include <reactos/version.rc>
-//#include <reactos/manifest_dll.rc>
+IDI_DEVMGR ICON "resources/devmgr.ico"
 
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-IDI_MAIN_ICON   ICON    "resources/computer.ico"
-IDB_ROOT_IMAGE  BITMAP  "resources/root.bmp"
-
-/* main toolbar icons */
-IDB_TOOLBAR    BITMAP DISCARDABLE "resources/toolbar.bmp"
+#include <reactos/manifest_dll.rc>
 
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/en-US.rc"
+#ifdef LANGUAGE_BG_BG
+    #include "lang/bg-BG.rc"
+#endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EL_GR
+    #include "lang/el-GR.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_ES_ES
+    #include "lang/es-ES.rc"
+#endif
+#ifdef LANGUAGE_HE_IL
+    #include "lang/he-IL.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_HU_HU
+    #include "lang/hu-HU.rc"
+#endif
+#ifdef LANGUAGE_ID_ID
+    #include "lang/id-ID.rc"
+#endif
+#ifdef LANGUAGE_IT_IT
+    #include "lang/it-IT.rc"
+#endif
+#ifdef LANGUAGE_NB_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_PT_BR
+    #include "lang/pt-BR.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif

Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-US.rc?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/lang/en-US.rc        [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc        [iso-8859-1] Thu Sep 24 
07:30:08 2015
@@ -235,85 +235,3 @@
     ICON "", IDC_DEVICON, 7, 7, 20, 20
     LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX
 END
-
-
-/*
- This code relates to the device manager GUI
- */
-
-IDR_MAINMENU MENU
-BEGIN
-  POPUP "&File"
-  BEGIN
-    MENUITEM "E&xit",                       IDC_EXIT
-  END
-  MENUITEM "Action"                         IDC_ACTIONMENU
-  POPUP "View"
-  BEGIN
-    MENUITEM "Devices by type",             IDC_DEVBYTYPE
-    MENUITEM "Devices by connection",       IDC_DEVBYCONN
-    MENUITEM "Resources by type",           IDC_RESBYTYPE, GRAYED
-    MENUITEM "Resources by connection",     IDC_RESBYCONN, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "Show hidden devices",         IDC_SHOWHIDDEN
-  END
-  POPUP "Help"
-  BEGIN
-    MENUITEM "About",                       IDC_ABOUT
-  END
-END
-
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_APPNAME               "ReactOS Device Manager"
-  IDS_CONFIRM_DISABLE       "Disabling this device will cause it to stop 
functioning.\r\nDo you really want to disable it?"
-END
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_MENU_UPDATE           "Update driver software..."
-  IDS_MENU_ENABLE           "Enable"
-  IDS_MENU_DISABLE          "Disable"
-  IDS_MENU_UNINSTALL        "Uninstall"
-  IDS_MENU_SCAN             "Scan for hardware changes"
-  IDS_MENU_ADD              "Add hardware"
-  IDS_MENU_PROPERTIES       "Properties"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_TOOLTIP_PROPERTIES    "Properties"
-  IDS_TOOLTIP_SCAN          "Scan for hardware changes"
-  IDS_TOOLTIP_ENABLE        "Enable"
-  IDS_TOOLTIP_DISABLE       "Disable"
-  IDS_TOOLTIP_UPDATE        "Update Driver Software"
-  IDS_TOOLTIP_UNINSTALL     "Uninstall"
-END
-
-/* Hints */
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_HINT_BLANK        " "
-  IDS_HINT_PROPERTIES   " Open property dialog for the current selection."
-  IDS_HINT_SCAN         " Scan for changed or new plug and play devices."
-  IDS_HINT_ENABLE       " Enables the selected device."
-  IDS_HINT_DISABLE      " Disables the selected device."
-  IDS_HINT_UPDATE       " Launches the Update Driver Software wizard for the 
selected device."
-  IDS_HINT_UNINSTALL    " Uninstalls the driver for the selected device."
-  IDS_HINT_ADD          " Adds a legacy (non-Plug and Play) device to the 
computer." 
-  IDS_HINT_ABOUT        " About ReactOS Device Manager."
-  IDS_HINT_EXIT         " Exits the program."
-
-  IDS_HINT_DEV_BY_TYPE  " Displays devices by hardware type."
-  IDS_HINT_DEV_BY_CONN  " Displays devices by connection."
-  IDS_HINT_RES_BY_TYPE  " Displays resources by type."
-  IDS_HINT_RES_BY_CONN  " Displays resources by connection type."
-  IDS_HINT_SHOW_HIDDEN  " Displays legacy devices and devices that are no 
longer installed."
-
-  IDS_HINT_SYS_RESTORE  " Restores this window to normal size."
-  IDS_HINT_SYS_MOVE     " Moves this window."
-  IDS_HINT_SYS_SIZE     " Resizes this window."
-  IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon."
-  IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen."
-  IDS_HINT_SYS_CLOSE    " Closes this window."
-END

Modified: trunk/reactos/dll/win32/devmgr/resource.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resource.h?rev=69346&r1=69345&r2=69346&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/resource.h   [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/resource.h   [iso-8859-1] Thu Sep 24 
07:30:08 2015
@@ -1,98 +1,46 @@
 #pragma once
 
-#define IDC_STATIC          -1
+#define IDI_DEVMGR 100
 
-#define IDS_APPNAME         10
+#define IDD_HARDWARE        100
+#define IDD_DEVICEGENERAL   101
+#define IDD_DEVICEDRIVER    102
+#define IDD_DEVICERESOURCES 103
+#define IDD_DRIVERDETAILS   104
+#define IDD_DEVICEDETAILS   105
+#define IDD_DEVICEPOWER     106
 
-#define IDI_MAIN_ICON       20
-#define IDB_ROOT_IMAGE      21
-#define IDB_TOOLBAR         22
-
-/* windows */
-#define IDC_TREEVIEW        30
-#define IDC_TOOLBAR         31
-#define IDC_STATUSBAR       32
-#define IDR_MAINMENU        33
-#define IDR_POPUP           34
-
-/* Actions */
-#define IDC_PROPERTIES      40
-#define IDC_SCAN_HARDWARE   41
-#define IDC_ENABLE_DRV      42
-#define IDC_DISABLE_DRV     43
-#define IDC_UPDATE_DRV      44
-#define IDC_UNINSTALL_DRV   45
-#define IDC_ADD_HARDWARE    46
-
-/* Menu items */
-#define IDC_ACTIONMENU      50
-#define IDC_ABOUT           51
-#define IDC_EXIT            52
-
-
-/* view menu */
-#define IDC_DEVBYTYPE       60
-#define IDC_DEVBYCONN       61
-#define IDC_RESBYTYPE       62
-#define IDC_RESBYCONN       63
-#define IDC_SHOWHIDDEN      64
-
-
-/* tooltips */
-#define IDS_TOOLTIP_PROPERTIES  70
-#define IDS_TOOLTIP_SCAN        71
-#define IDS_TOOLTIP_ENABLE      72
-#define IDS_TOOLTIP_DISABLE     73
-#define IDS_TOOLTIP_UPDATE      74
-#define IDS_TOOLTIP_UNINSTALL   75
-
-/* General strings */
-#define IDS_CONFIRM_DISABLE     80
-
-/* Menu strings */
-#define IDS_MENU_UPDATE         90
-#define IDS_MENU_ENABLE         91
-#define IDS_MENU_DISABLE        92
-#define IDS_MENU_UNINSTALL      93
-#define IDS_MENU_SCAN           94
-#define IDS_MENU_ADD            95
-#define IDS_MENU_PROPERTIES     96
-
-
-/* menu hints */
-#define IDS_HINT_BLANK          100
-#define IDS_HINT_PROPERTIES     101
-#define IDS_HINT_SCAN           102
-#define IDS_HINT_ENABLE         103
-#define IDS_HINT_DISABLE        104
-#define IDS_HINT_UPDATE         105
-#define IDS_HINT_UNINSTALL      106
-#define IDS_HINT_ADD            107
-#define IDS_HINT_ABOUT          108
-#define IDS_HINT_EXIT           109
-
-#define IDS_HINT_DEV_BY_TYPE    120
-#define IDS_HINT_DEV_BY_CONN    121
-#define IDS_HINT_RES_BY_TYPE    123
-#define IDS_HINT_RES_BY_CONN    124
-#define IDS_HINT_SHOW_HIDDEN    125
-
-/* system menu hints */
-#define IDS_HINT_SYS_RESTORE    130
-#define IDS_HINT_SYS_MOVE       131
-#define IDS_HINT_SYS_SIZE       132
-#define IDS_HINT_SYS_MINIMIZE   133
-#define IDS_HINT_SYS_MAXIMIZE   134
-#define IDS_HINT_SYS_CLOSE      135
-
-
-
-
-
-
-
-
-#define IDI_DEVMGR 255
+#define IDC_DEVICON          0x57B
+#define IDC_DEVNAME          0x57C
+#define IDC_DEVTYPE          0x57D
+#define IDC_DEVMANUFACTURER  0x57E
+#define IDC_DEVLOCATION      0x57F
+#define IDC_DEVSTATUSGROUP   0x580
+#define IDC_DEVSTATUS        0x581
+#define IDC_DEVUSAGE         0x582
+#define IDC_DEVICES          0x583
+#define IDC_LV_DEVICES       0x584
+#define IDC_PROPERTIESGROUP  0x585
+#define IDC_MANUFACTURER     0x587
+#define IDC_LOCATION         0x588
+#define IDC_STATUS           0x586
+#define IDC_TROUBLESHOOT     0x589
+#define IDC_PROPERTIES       0x58A
+#define IDC_DEVUSAGELABEL    0x58B
+#define IDC_DEVPROBLEM       0x58C
+#define IDC_DRVPROVIDER      0x58D
+#define IDC_DRVDATE          0x58E
+#define IDC_DRVVERSION       0x58F
+#define IDC_DIGITALSIGNER    0x590
+#define IDC_DRIVERDETAILS    0x591
+#define IDC_DRIVERFILES      0x592
+#define IDC_FILEPROVIDER     0x593
+#define IDC_FILEVERSION      0x594
+#define IDC_FILECOPYRIGHT    0x595
+#define IDC_DETAILSPROPNAME  0x596
+#define IDC_DETAILSPROPVALUE 0x597
+#define IDC_UPDATEDRIVER     0x598
+#define IDC_DRIVERRESOURCES  0x599
 
 #define IDS_NAME                  0x100
 #define IDS_TYPE                  0x101
@@ -206,43 +154,3 @@
 #define IDS_PROP_CURRENTPOWERSTATE  0x315
 #define IDS_PROP_POWERCAPABILITIES  0x316
 #define IDS_PROP_POWERSTATEMAPPINGS 0x317
-
-#define IDD_HARDWARE        0x400
-#define IDD_DEVICEGENERAL   0x401
-#define IDD_DEVICEDRIVER    0x402
-#define IDD_DEVICERESOURCES 0x403
-#define IDD_DRIVERDETAILS   0x404
-#define IDD_DEVICEDETAILS   0x405
-#define IDD_DEVICEPOWER     0x406
-
-#define IDC_DEVICON          0x57B
-#define IDC_DEVNAME          0x57C
-#define IDC_DEVTYPE          0x57D
-#define IDC_DEVMANUFACTURER  0x57E
-#define IDC_DEVLOCATION      0x57F
-#define IDC_DEVSTATUSGROUP   0x580
-#define IDC_DEVSTATUS        0x581
-#define IDC_DEVUSAGE         0x582
-#define IDC_DEVICES          0x583
-#define IDC_LV_DEVICES       0x584
-#define IDC_PROPERTIESGROUP  0x585
-#define IDC_MANUFACTURER     0x587
-#define IDC_LOCATION         0x588
-#define IDC_STATUS           0x586
-#define IDC_TROUBLESHOOT     0x589
-#define IDC_PROPERTIES2      0x58A
-#define IDC_DEVUSAGELABEL    0x58B
-#define IDC_DEVPROBLEM       0x58C
-#define IDC_DRVPROVIDER      0x58D
-#define IDC_DRVDATE          0x58E
-#define IDC_DRVVERSION       0x58F
-#define IDC_DIGITALSIGNER    0x590
-#define IDC_DRIVERDETAILS    0x591
-#define IDC_DRIVERFILES      0x592
-#define IDC_FILEPROVIDER     0x593
-#define IDC_FILEVERSION      0x594
-#define IDC_FILECOPYRIGHT    0x595
-#define IDC_DETAILSPROPNAME  0x596
-#define IDC_DETAILSPROPVALUE 0x597
-#define IDC_UPDATEDRIVER     0x598
-#define IDC_DRIVERRESOURCES  0x599

Removed: trunk/reactos/dll/win32/devmgr/resources/computer.ico
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resources/computer.ico?rev=69345
==============================================================================
Binary file - no diff available.

Removed: trunk/reactos/dll/win32/devmgr/resources/root.bmp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resources/root.bmp?rev=69345
==============================================================================
Binary file - no diff available.

Removed: trunk/reactos/dll/win32/devmgr/resources/toolbar.bmp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resources/toolbar.bmp?rev=69345
==============================================================================
Binary file - no diff available.

Removed: trunk/reactos/dll/win32/devmgr/stdafx.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stdafx.h?rev=69345
==============================================================================
--- trunk/reactos/dll/win32/devmgr/stdafx.h     [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/stdafx.h     (removed)
@@ -1,75 +0,0 @@
-#pragma once
-
-#ifndef __REACTOS__
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <windowsx.h>
-#include <setupapi.h>
-#include <cfgmgr32.h>
-#include <commctrl.h>
-#include <Uxtheme.h>
-#include <Cfgmgr32.h>
-#include <devguid.h>
-#include <process.h>
-#include <RegStr.h>
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS      // some CString constructors 
will be explicit
-#include <tchar.h>
-#include <atlbase.h>
-#include <atlstr.h>
-#include <atlcoll.h>
-
-#include <strsafe.h>
-
-#define ERR printf
-#define FIXME printf
-#define UNIMPLEMENTED
-#define WINE_DEFAULT_DEBUG_CHANNEL(t)
-
-DWORD WINAPI pSetupGuidFromString(PCWSTR pString, LPGUID lpGUID);
-
-BOOL
-WINAPI
-InstallDevInst(
-IN HWND hWndParent,
-IN LPCWSTR InstanceId,
-IN BOOL bUpdate,
-OUT LPDWORD lpReboot);
-
-#else
-
-#include <string.h>
-#include <wchar.h>
-
-#include <tchar.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <wincon.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#include <strsafe.h>
-#include <process.h>
-#include <windowsx.h>
-#include <strsafe.h>
-#include <regstr.h>
-#include <newdevp.h>
-
-#include <setupapi.h>
-#include <commctrl.h>
-#include <cfgmgr32.h>
-#include <uxtheme.h>
-#include <devguid.h>
-
-#include <atlbase.h>
-#include <atlstr.h>
-#include <atlcoll.h>
-
-#include <wine/debug.h>
-
-//WINE_DEFAULT_DEBUG_CHANNEL(devmgr);
-
-#endif


Reply via email to