Author: tfaber
Date: Sun Apr 19 21:14:49 2015
New Revision: 67312
URL: http://svn.reactos.org/svn/reactos?rev=67312&view=rev
Log:
[NETSHELL]
- Use the correct names for netshell's CLSIDs as indicated by the registry and
public symbols
Modified:
trunk/reactos/dll/shellext/netshell/README
trunk/reactos/dll/shellext/netshell/classfactory.cpp
trunk/reactos/dll/shellext/netshell/connectmanager.cpp
trunk/reactos/dll/shellext/netshell/enumlist.cpp
trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp
trunk/reactos/include/reactos/shlguid_undoc.h
Modified: trunk/reactos/dll/shellext/netshell/README
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/README?rev=67312&r1=67311&r2=67312&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/netshell/README [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/netshell/README [iso-8859-1] Sun Apr 19
21:14:49 2015
@@ -22,7 +22,7 @@
=== Status Dialog & Notification Area ===
-The status dialog is implemented by IOleCommandTarget
interface(CLSID_LanConnectStatusUI). This interface manages all status dialogs
+The status dialog is implemented by IOleCommandTarget
interface(CLSID_ConnectionTray). This interface manages all status dialogs
for all available dialogs. The interface is implemented as a singleton to
advoid multiple notification icons
appear in the Notification area of the explorer. Everytime the IShellFolder
object is created (ISF_NetConnect_Constructor),
it creates a reference to IOleCommandTarget interface and calls its
IOleCommandTarget::Exec function with CGID_ShellServiceObject.
Modified: trunk/reactos/dll/shellext/netshell/classfactory.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/classfactory.cpp?rev=67312&r1=67311&r2=67312&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/netshell/classfactory.cpp [iso-8859-1]
(original)
+++ trunk/reactos/dll/shellext/netshell/classfactory.cpp [iso-8859-1]
Sun Apr 19 21:14:49 2015
@@ -72,13 +72,13 @@
{
*ppvObject = NULL;
- if (IsEqualCLSID(m_clsid, CLSID_NetworkConnections))
+ if (IsEqualCLSID(m_clsid, CLSID_ConnectionFolder))
return ISF_NetConnect_Constructor(pUnkOuter, riid, ppvObject);
else if (IsEqualCLSID(m_clsid, CLSID_ConnectionManager))
return INetConnectionManager_Constructor(pUnkOuter, riid, ppvObject);
- else if (IsEqualCLSID(m_clsid, CLSID_LANConnectUI))
+ else if (IsEqualCLSID(m_clsid, CLSID_LanConnectionUi))
return LanConnectUI_Constructor(pUnkOuter, riid, ppvObject);
- else if (IsEqualCLSID(m_clsid, CLSID_LanConnectStatusUI))
+ else if (IsEqualCLSID(m_clsid, CLSID_ConnectionTray))
return LanConnectStatusUI_Constructor(pUnkOuter, riid, ppvObject);
return E_NOINTERFACE;
Modified: trunk/reactos/dll/shellext/netshell/connectmanager.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/connectmanager.cpp?rev=67312&r1=67311&r2=67312&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/netshell/connectmanager.cpp [iso-8859-1]
(original)
+++ trunk/reactos/dll/shellext/netshell/connectmanager.cpp [iso-8859-1]
Sun Apr 19 21:14:49 2015
@@ -321,7 +321,7 @@
{
if (m_Props.MediaType == NCM_LAN)
{
- CopyMemory(pclsid, &CLSID_LANConnectUI, sizeof(CLSID));
+ CopyMemory(pclsid, &CLSID_LanConnectionUi, sizeof(CLSID));
return S_OK;
}
Modified: trunk/reactos/dll/shellext/netshell/enumlist.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/enumlist.cpp?rev=67312&r1=67311&r2=67312&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/netshell/enumlist.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/netshell/enumlist.cpp [iso-8859-1] Sun Apr 19
21:14:49 2015
@@ -207,7 +207,7 @@
{
LPPIDLDATA pData = _ILGetDataPointer(pidlOut);
- memcpy(&(pData->u.guid.guid), &CLSID_NetworkConnections, sizeof(GUID));
+ memcpy(&(pData->u.guid.guid), &CLSID_ConnectionFolder, sizeof(GUID));
}
return pidlOut;
}
@@ -231,7 +231,7 @@
const IID *piid = _ILGetGUIDPointer(const_cast<LPITEMIDLIST>(pidl));
if (piid)
- return IsEqualIID(*piid, CLSID_NetworkConnections);
+ return IsEqualIID(*piid, CLSID_ConnectionFolder);
return FALSE;
}
Modified: trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp?rev=67312&r1=67311&r2=67312&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1]
(original)
+++ trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1]
Sun Apr 19 21:14:49 2015
@@ -144,7 +144,7 @@
m_pidlRoot(_ILCreateNetConnect())
{
HRESULT hr;
- hr = CoCreateInstance(CLSID_LanConnectStatusUI, NULL,
CLSCTX_INPROC_SERVER, IID_IOleCommandTarget,
reinterpret_cast<PVOID*>(&m_lpOleCmd));
+ hr = CoCreateInstance(CLSID_ConnectionTray, NULL, CLSCTX_INPROC_SERVER,
IID_IOleCommandTarget, reinterpret_cast<PVOID*>(&m_lpOleCmd));
if (FAILED(hr))
{
ERR("CoCreateInstance failed with %lx\n", hr);
@@ -1115,7 +1115,7 @@
if (!lpClassId)
return E_POINTER;
- *lpClassId = CLSID_NetworkConnections;
+ *lpClassId = CLSID_ConnectionFolder;
return S_OK;
}
Modified: trunk/reactos/include/reactos/shlguid_undoc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_undoc.h?rev=67312&r1=67311&r2=67312&view=diff
==============================================================================
--- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Sun Apr 19
21:14:49 2015
@@ -114,16 +114,24 @@
DEFINE_GUID(CGID_MenuDeskBar, 0x5C9F0A12, 0x959E, 0x11D0, 0xA3,
0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36);
-DEFINE_GUID(CLSID_LANConnectUI, 0x7007ACC5, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
-DEFINE_GUID(CLSID_NetworkConnections, 0x7007ACC7, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
-DEFINE_GUID(CLSID_LanConnectStatusUI, 0x7007ACCF, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_DialupConnectionUi, 0x7007ACC1, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_DirectConnectionUi, 0x7007ACC2, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_InboundConnectionUi, 0x7007ACC3, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_InternetConnectionUi, 0x7007ACC4, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_LanConnectionUi, 0x7007ACC5, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_VpnConnectionUi, 0x7007ACC6, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_ConnectionFolder, 0x7007ACC7, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_ConnectionFolderEnum, 0x7007ACC8, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_ConnectionTray, 0x7007ACCF, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_ConnectionCommonUi, 0x7007ACD1, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_NetConnectionUiUtilities,0x7007ACD3, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_PPPoEUi, 0x7007ACD4, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
+DEFINE_GUID(CLSID_SharedAccessConnectionUi,0x7007ACD5, 0x3202, 0x11D1, 0xAA,
0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E);
DEFINE_GUID(CLSID_SysTray, 0x35CEC8A3, 0x2BE6, 0x11D2, 0x87,
0x73, 0x92, 0xE2, 0x20, 0x52, 0x41, 0x53);
DEFINE_GUID(CLSID_BackgroundTaskScheduler, 0x603D3800, 0xBD81, 0x11d0, 0xA3,
0xA5, 0x00, 0xC0, 0x4F, 0xD7, 0x06, 0xEC);
DEFINE_GUID(CLSID_SharedTaskScheduler, 0x603D3801, 0xBD81, 0x11d0, 0xA3,
0xA5, 0x00, 0xC0, 0x4F, 0xD7, 0x06, 0xEC);
-
-#define CLSID_ConnectionTray CLSID_LanConnectStatusUI
#define CGID_IExplorerToolbar IID_IExplorerToolbar
#define SID_IExplorerToolbar IID_IExplorerToolbar
