Skip to content

Commit 76014b9

Browse files
authored
[REACTOS] Replace all references of CLSID_ConnectionFolder to CLSID_NetworkConnections (reactos#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 reactos#7266
1 parent e62c917 commit 76014b9

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

dll/shellext/netshell/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ reimplement these stubs alongside all its unimplemented interfaces and objects,
6060
the system netshell with ours (INetConnectionManager and IEnumNetConnection are only the tip
6161
of the iceberg).
6262
However it is perfectly fine if one copies our netshell in a different folder and change the
63-
registry settings to make it handle CLSID_ConnectionFolder, CLSID_LanConnectionUi and CLSID_ConnectionTray.
63+
registry settings to make it handle CLSID_NetworkConnections, CLSID_LanConnectionUi and CLSID_ConnectionTray.
6464
When doing so there are actually two options about how to test. One is leaving #define USE_CUSTOM_CONMGR 1
6565
as is and the other is setting is to 0. What this does is that when 0, the connections will be enumerated
6666
in the shell folder and the tray using the system's INetConnectionManager (which resides in the system's

dll/shellext/netshell/netshell.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class CNetshellModule : public CComModule
1717
};
1818

1919
BEGIN_OBJECT_MAP(ObjectMap)
20-
OBJECT_ENTRY(CLSID_ConnectionFolder, CNetworkConnections)
20+
OBJECT_ENTRY(CLSID_NetworkConnections, CNetworkConnections)
2121
OBJECT_ENTRY(CLSID_ConnectionManager, CNetConnectionManager)
2222
OBJECT_ENTRY(CLSID_LanConnectionUi, CNetConnectionPropertyUi)
2323
OBJECT_ENTRY(CLSID_ConnectionTray, CLanStatus)

dll/shellext/netshell/shfldr_netconnect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ HRESULT WINAPI CNetworkConnections::GetClassID(CLSID *lpClassId)
797797
if (!lpClassId)
798798
return E_POINTER;
799799

800-
*lpClassId = CLSID_ConnectionFolder;
800+
*lpClassId = CLSID_NetworkConnections;
801801

802802
return S_OK;
803803
}

dll/shellext/netshell/shfldr_netconnect.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ typedef struct {
88
} shvheader;
99

1010
class CNetworkConnections:
11-
public CComCoClass<CNetworkConnections, &CLSID_ConnectionFolder>,
11+
public CComCoClass<CNetworkConnections, &CLSID_NetworkConnections>,
1212
public CComObjectRootEx<CComMultiThreadModelNoCS>,
1313
public IPersistFolder2,
1414
public IShellExtInit,

dll/win32/shell32/folders/CRegFolder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ BOOL CRegFolder::_IsInNameSpace(_In_ LPCITEMIDLIST pidl)
412412
CLSID clsid = *_ILGetGUIDPointer(pidl);
413413
if (IsEqualGUID(clsid, CLSID_Printers))
414414
return TRUE;
415-
if (IsEqualGUID(clsid, CLSID_ConnectionFolder))
415+
if (IsEqualGUID(clsid, CLSID_NetworkConnections))
416416
return TRUE;
417417
FIXME("Check registry\n");
418418
return TRUE;

modules/rostests/apitests/com/netshell.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
2020
L"Both"
2121
},
2222
{
23-
ID_NAME(CLSID_ConnectionFolder),
23+
ID_NAME(CLSID_NetworkConnections),
2424
{
2525
{ 0x0, &IID_IPersistFolder2 },
2626
{ 0x0, &IID_IPersistFolder },

0 commit comments

Comments
 (0)