[ros-diffs] [reactos] 01/01: [SDK][SHELL32] Make CLSID_NetworkConnections the default name (#7266)

[Vitaly Orekhov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06024c97fea534c935a0b…

commit 06024c97fea534c935a0b2f781495ceba112bbcd
Author:     Vitaly Orekhov <crce2000(a)mail.ru>
AuthorDate: Sun Sep 1 11:40:24 2024 +0300
Commit:     GitHub <noreply(a)github.com>
CommitDate: Sun Sep 1 11:40:24 2024 +0300

    [SDK][SHELL32] Make CLSID_NetworkConnections the default name (#7266)
    
    - [SDK][INCLUDE] Redirect CLSID_ConnectionFolder to CLSID_NetworkConnections
    
    CLSID_NetworkConnections is the official known name for the class behind it,
    thus to avoid breaking current code I 'softlink' CLSID_ConnectionFolder
    to the currently used CLSID_NetworkConnections in shlguid_undoc.h.
    
    - [SHELL32] Refer to CLSID_NetworkConnections from PSDK
---
 dll/win32/shell32/wine/shellpath.c  | 5 +----
 sdk/include/reactos/shlguid_undoc.h | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c
index 6537e052a0d..e55b48b1c33 100644
--- a/dll/win32/shell32/wine/shellpath.c
+++ b/dll/win32/shell32/wine/shellpath.c
@@ -3214,11 +3214,8 @@ HRESULT WINAPI SHGetFolderLocation(
 
 #ifdef __REACTOS__
         case CSIDL_CONNECTIONS:
-        {
-            EXTERN_C const CLSID CLSID_ConnectionFolder;
-            hr = SHGetFolderLocationHelper(hwndOwner, CSIDL_CONTROLS,
&CLSID_ConnectionFolder, ppidl);
+            hr = SHGetFolderLocationHelper(hwndOwner, CSIDL_CONTROLS,
&CLSID_NetworkConnections, ppidl);
             break;
-        }
 #endif
 
         default:
diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h
index 99baa6ccf58..b72e61c9e3d 100644
--- a/sdk/include/reactos/shlguid_undoc.h
+++ b/sdk/include/reactos/shlguid_undoc.h
@@ -127,7 +127,7 @@ DEFINE_GUID(CLSID_InboundConnectionUi,     0x7007ACC3, 0x3202, 0x11D1,
0xAA, 0xD
 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 CLSID_ConnectionFolder CLSID_NetworkConnections
 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);