mirror of
https://github.com/reactos/reactos.git
synced 2024-12-26 17:14:41 +00:00
[REACTOS] Replace all references of CLSID_ConnectionFolder to CLSID_NetworkConnections (#7503)
Use name from public Windows SDK for 'Network Connections' CLSID, available since Windows SDK 6.0A (Visual Studio 2008 or higher).
Replace all such instances in netshell, shell32, apitests/com.
- Partially reverts/refactors commit bea0b47
- Follow-up to PR #7266
This commit is contained in:
parent
e62c917ddf
commit
76014b92a4
6 changed files with 6 additions and 6 deletions
|
@ -60,7 +60,7 @@ reimplement these stubs alongside all its unimplemented interfaces and objects,
|
|||
the system netshell with ours (INetConnectionManager and IEnumNetConnection are only the tip
|
||||
of the iceberg).
|
||||
However it is perfectly fine if one copies our netshell in a different folder and change the
|
||||
registry settings to make it handle CLSID_ConnectionFolder, CLSID_LanConnectionUi and CLSID_ConnectionTray.
|
||||
registry settings to make it handle CLSID_NetworkConnections, CLSID_LanConnectionUi and CLSID_ConnectionTray.
|
||||
When doing so there are actually two options about how to test. One is leaving #define USE_CUSTOM_CONMGR 1
|
||||
as is and the other is setting is to 0. What this does is that when 0, the connections will be enumerated
|
||||
in the shell folder and the tray using the system's INetConnectionManager (which resides in the system's
|
||||
|
|
|
@ -17,7 +17,7 @@ public:
|
|||
};
|
||||
|
||||
BEGIN_OBJECT_MAP(ObjectMap)
|
||||
OBJECT_ENTRY(CLSID_ConnectionFolder, CNetworkConnections)
|
||||
OBJECT_ENTRY(CLSID_NetworkConnections, CNetworkConnections)
|
||||
OBJECT_ENTRY(CLSID_ConnectionManager, CNetConnectionManager)
|
||||
OBJECT_ENTRY(CLSID_LanConnectionUi, CNetConnectionPropertyUi)
|
||||
OBJECT_ENTRY(CLSID_ConnectionTray, CLanStatus)
|
||||
|
|
|
@ -797,7 +797,7 @@ HRESULT WINAPI CNetworkConnections::GetClassID(CLSID *lpClassId)
|
|||
if (!lpClassId)
|
||||
return E_POINTER;
|
||||
|
||||
*lpClassId = CLSID_ConnectionFolder;
|
||||
*lpClassId = CLSID_NetworkConnections;
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ typedef struct {
|
|||
} shvheader;
|
||||
|
||||
class CNetworkConnections:
|
||||
public CComCoClass<CNetworkConnections, &CLSID_ConnectionFolder>,
|
||||
public CComCoClass<CNetworkConnections, &CLSID_NetworkConnections>,
|
||||
public CComObjectRootEx<CComMultiThreadModelNoCS>,
|
||||
public IPersistFolder2,
|
||||
public IShellExtInit,
|
||||
|
|
|
@ -412,7 +412,7 @@ BOOL CRegFolder::_IsInNameSpace(_In_ LPCITEMIDLIST pidl)
|
|||
CLSID clsid = *_ILGetGUIDPointer(pidl);
|
||||
if (IsEqualGUID(clsid, CLSID_Printers))
|
||||
return TRUE;
|
||||
if (IsEqualGUID(clsid, CLSID_ConnectionFolder))
|
||||
if (IsEqualGUID(clsid, CLSID_NetworkConnections))
|
||||
return TRUE;
|
||||
FIXME("Check registry\n");
|
||||
return TRUE;
|
||||
|
|
|
@ -20,7 +20,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
|
|||
L"Both"
|
||||
},
|
||||
{
|
||||
ID_NAME(CLSID_ConnectionFolder),
|
||||
ID_NAME(CLSID_NetworkConnections),
|
||||
{
|
||||
{ 0x0, &IID_IPersistFolder2 },
|
||||
{ 0x0, &IID_IPersistFolder },
|
||||
|
|
Loading…
Reference in a new issue