Author: tfaber
Date: Sun Apr 19 15:01:54 2015
New Revision: 67298
URL: http://svn.reactos.org/svn/reactos?rev=67298&view=rev
Log:
[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
Modified:
trunk/reactos/dll/cpl/ncpa/ncpa.c
trunk/reactos/dll/shellext/netshell/res/netshell.rgs
Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=67298&r1=67297&r2=67298&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] Sun Apr 19 15:01:54 2015
@@ -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;
}
Modified: trunk/reactos/dll/shellext/netshell/res/netshell.rgs
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/res/netshell.rgs?rev=67298&r1=67297&r2=67298&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/netshell/res/netshell.rgs [iso-8859-1]
(original)
+++ trunk/reactos/dll/shellext/netshell/res/netshell.rgs [iso-8859-1]
Sun Apr 19 15:01:54 2015
@@ -15,14 +15,14 @@
}
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 @@
{
NoRemove Explorer
{
- NoRemove MyComputer
+ NoRemove ControlPanel
{
NoRemove NameSpace
{
