From: Thomas Faber <thomas.faber@reactos.org>
Date: Sun, 19 Apr 2015 15:01:54 +0000 (+0000)
Subject: [NETSHELL]{NCPA]
X-Git-Tag: backups/colins-printing-for-freedom@73041~318
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=295cce9d87c3aea83186374bf0304e2a06c6c9de

[NETSHELL]{NCPA]
- Move Network Connections back to Control Panel, where it belongs. Was accidentally moved to My Computer in r66485.
CORE-9495 #resolve
CORE-9564

svn path=/trunk/; revision=67298
---

diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c
index 87dac5bcf4d..41d6958cd0a 100644
--- a/reactos/dll/cpl/ncpa/ncpa.c
+++ b/reactos/dll/cpl/ncpa/ncpa.c
@@ -18,11 +18,7 @@
 LONG CALLBACK
 DisplayApplet(VOID)
 {
-	WCHAR szParameters[160];
-	// FIXME: Use correct path
-	//::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}
-
-	wcscpy(szParameters, L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}");
+	WCHAR szParameters[] = L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}";
 
 	return (INT_PTR) ShellExecuteW(NULL, L"open", L"explorer.exe", szParameters, NULL, SW_SHOWDEFAULT) > 32;
 }
diff --git a/reactos/dll/shellext/netshell/res/netshell.rgs b/reactos/dll/shellext/netshell/res/netshell.rgs
index c2bc3467f54..01c5ce602e3 100644
--- a/reactos/dll/shellext/netshell/res/netshell.rgs
+++ b/reactos/dll/shellext/netshell/res/netshell.rgs
@@ -15,14 +15,14 @@ HKCR
             }
             val LocalizedString = s '@%MODULE%,-10000'
         }
-        ForceRemove {7007ACC5-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections'
+        ForceRemove {7007ACC5-3202-11D1-AAD2-00805FC1270E} = s 'LAN Connection UI'
         {
             InprocServer32 = s '%MODULE%'
             {
                 val ThreadingModel = s 'Both'
             }
         }
-        ForceRemove {7007ACCF-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections'
+        ForceRemove {7007ACCF-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections Status Icon'
         {
             InprocServer32 = s '%MODULE%'
             {
@@ -43,7 +43,7 @@ HKLM
         {
           NoRemove Explorer
           {
-            NoRemove MyComputer
+            NoRemove ControlPanel
             {
               NoRemove NameSpace
               {