Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[REACTOS] Replace all references of CLSID_ConnectionFolder to CLSID_NetworkConnections (#7503)

Browse source 
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:
Vitaly Orekhov 2024-12-02 22:27:19 +03:00 committed by GitHub
parent e62c917ddf
commit 76014b92a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/shellext/netshell/README
View file

@ -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 the system netshell with ours (INetConnectionManager and IEnumNetConnection are only the tip
of the iceberg). of the iceberg).
However it is perfectly fine if one copies our netshell in a different folder and change the 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 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 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 in the shell folder and the tray using the system's INetConnectionManager (which resides in the system's

2
dll/shellext/netshell/netshell.cpp
View file

@ -17,7 +17,7 @@ public:
}; };
BEGIN_OBJECT_MAP(ObjectMap) BEGIN_OBJECT_MAP(ObjectMap)
OBJECT_ENTRY(CLSID_ConnectionFolder, CNetworkConnections) OBJECT_ENTRY(CLSID_NetworkConnections, CNetworkConnections)
OBJECT_ENTRY(CLSID_ConnectionManager, CNetConnectionManager) OBJECT_ENTRY(CLSID_ConnectionManager, CNetConnectionManager)
OBJECT_ENTRY(CLSID_LanConnectionUi, CNetConnectionPropertyUi) OBJECT_ENTRY(CLSID_LanConnectionUi, CNetConnectionPropertyUi)
OBJECT_ENTRY(CLSID_ConnectionTray, CLanStatus) OBJECT_ENTRY(CLSID_ConnectionTray, CLanStatus)

2
dll/shellext/netshell/shfldr_netconnect.cpp
View file

@ -797,7 +797,7 @@ HRESULT WINAPI CNetworkConnections::GetClassID(CLSID *lpClassId)
if (!lpClassId) if (!lpClassId)
return E_POINTER; return E_POINTER;
*lpClassId = CLSID_ConnectionFolder; *lpClassId = CLSID_NetworkConnections;
return S_OK; return S_OK;
} }

2
dll/shellext/netshell/shfldr_netconnect.h
View file

@ -8,7 +8,7 @@ typedef struct {
} shvheader; } shvheader;
class CNetworkConnections: class CNetworkConnections:
public CComCoClass<CNetworkConnections, &CLSID_ConnectionFolder>, public CComCoClass<CNetworkConnections, &CLSID_NetworkConnections>,
public CComObjectRootEx<CComMultiThreadModelNoCS>, public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IPersistFolder2, public IPersistFolder2,
public IShellExtInit, public IShellExtInit,

2
dll/win32/shell32/folders/CRegFolder.cpp
View file

@ -412,7 +412,7 @@ BOOL CRegFolder::_IsInNameSpace(_In_ LPCITEMIDLIST pidl)
CLSID clsid = *_ILGetGUIDPointer(pidl); CLSID clsid = *_ILGetGUIDPointer(pidl);
if (IsEqualGUID(clsid, CLSID_Printers)) if (IsEqualGUID(clsid, CLSID_Printers))
return TRUE; return TRUE;
if (IsEqualGUID(clsid, CLSID_ConnectionFolder)) if (IsEqualGUID(clsid, CLSID_NetworkConnections))
return TRUE; return TRUE;
FIXME("Check registry\n"); FIXME("Check registry\n");
return TRUE; return TRUE;

2
modules/rostests/apitests/com/netshell.c
View file

@ -20,7 +20,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
L"Both" L"Both"
}, },
{ {
ID_NAME(CLSID_ConnectionFolder), ID_NAME(CLSID_NetworkConnections),
{ {
{ 0x0, &IID_IPersistFolder2 }, { 0x0, &IID_IPersistFolder2 },
{ 0x0, &IID_IPersistFolder }, { 0x0, &IID_IPersistFolder },