Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

08/09: [NETSHELL] CNetConnectionPropertyUi: Add a comment about how windows write the settings

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f722ddac96503d43813e6… commit f722ddac96503d43813e64e4b4fdb57c2790960e Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Nov 14 22:38:39 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 18 14:01:54 2018 +0200 [NETSHELL] CNetConnectionPropertyUi: Add a comment about how windows write the settings --- dll/shellext/netshell/lanconnectui.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index 6c1c0f281e..3a292d52dc 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -292,6 +292,7 @@ CNetConnectionPropertyUi::LANPropertiesUIDlg( else dwNotifyDisconnect = 0; + //NOTE: Windows write these setting with the undocumented INetLanConnection::SetInfo if (StringFromCLSID((CLSID)This->m_pProperties->guidId, &pStr) == ERROR_SUCCESS) { swprintf(szKey, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pStr);

6 years, 1 month

07/09: [NETSHELL] Move the implementation of the Disable button of the status dialog to CNetConnection::Disconnect

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0654d60eef6afb7c0047c… commit 0654d60eef6afb7c0047c7fad78e7684b61ea452 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Nov 13 00:36:52 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 18 14:01:54 2018 +0200 [NETSHELL] Move the implementation of the Disable button of the status dialog to CNetConnection::Disconnect --- dll/shellext/netshell/connectmanager.cpp | 128 +++++++++++++++++++++++++++++- dll/shellext/netshell/lanstatusui.cpp | 132 +------------------------------ 2 files changed, 130 insertions(+), 130 deletions(-) diff --git a/dll/shellext/netshell/connectmanager.cpp b/dll/shellext/netshell/connectmanager.cpp index da733db2da..0ca8651e52 100644 --- a/dll/shellext/netshell/connectmanager.cpp +++ b/dll/shellext/netshell/connectmanager.cpp @@ -50,11 +50,137 @@ CNetConnection::Connect() return E_NOTIMPL; } +BOOL +FindNetworkAdapter(HDEVINFO hInfo, SP_DEVINFO_DATA *pDevInfo, LPWSTR pGuid) +{ + DWORD dwIndex, dwSize; + HKEY hSubKey; + WCHAR szNetCfg[50]; + WCHAR szDetail[200] = L"SYSTEM\\CurrentControlSet\\Control\\Class\\"; + + dwIndex = 0; + do + { + ZeroMemory(pDevInfo, sizeof(SP_DEVINFO_DATA)); + pDevInfo->cbSize = sizeof(SP_DEVINFO_DATA); + + /* get device info */ + if (!SetupDiEnumDeviceInfo(hInfo, dwIndex++, pDevInfo)) + break; + + /* get device software registry path */ + if (!SetupDiGetDeviceRegistryPropertyW(hInfo, pDevInfo, SPDRP_DRIVER, NULL, (LPBYTE)&szDetail[39], sizeof(szDetail)/sizeof(WCHAR) - 40, &dwSize)) + break; + + /* open device registry key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szDetail, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) + break; + + /* query NetCfgInstanceId for current device */ + dwSize = sizeof(szNetCfg); + if (RegQueryValueExW(hSubKey, L"NetCfgInstanceId", NULL, NULL, (LPBYTE)szNetCfg, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + break; + } + RegCloseKey(hSubKey); + if (!_wcsicmp(pGuid, szNetCfg)) + { + return TRUE; + } + } while (TRUE); + + return FALSE; +} + HRESULT WINAPI CNetConnection::Disconnect() { - return E_NOTIMPL; + HKEY hKey; + NETCON_PROPERTIES * pProperties; + LPOLESTR pDisplayName; + WCHAR szPath[200]; + DWORD dwSize, dwType; + LPWSTR pPnp; + HDEVINFO hInfo; + SP_DEVINFO_DATA DevInfo; + SP_PROPCHANGE_PARAMS PropChangeParams; + HRESULT hr; + + hr = GetProperties(&pProperties); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hInfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT ); + if (!hInfo) + { + NcFreeNetconProperties(pProperties); + return E_FAIL; + } + + if (FAILED(StringFromCLSID((CLSID)pProperties->guidId, &pDisplayName))) + { + NcFreeNetconProperties(pProperties); + SetupDiDestroyDeviceInfoList(hInfo); + return E_FAIL; + } + NcFreeNetconProperties(pProperties); + + if (FindNetworkAdapter(hInfo, &DevInfo, pDisplayName)) + { + PropChangeParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + PropChangeParams.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; //; + PropChangeParams.StateChange = DICS_DISABLE; + PropChangeParams.Scope = DICS_FLAG_CONFIGSPECIFIC; + PropChangeParams.HwProfile = 0; + + if (SetupDiSetClassInstallParams(hInfo, &DevInfo, &PropChangeParams.ClassInstallHeader, sizeof(SP_PROPCHANGE_PARAMS))) + { + SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, hInfo, &DevInfo); + } + } + SetupDiDestroyDeviceInfoList(hInfo); + + swprintf(szPath, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pDisplayName); + CoTaskMemFree(pDisplayName); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return E_FAIL; + + dwSize = 0; + if (RegQueryValueExW(hKey, L"PnpInstanceID", NULL, &dwType, NULL, &dwSize) != ERROR_SUCCESS || dwType != REG_SZ) + { + RegCloseKey(hKey); + return E_FAIL; + } + + pPnp = static_cast<PWSTR>(CoTaskMemAlloc(dwSize)); + if (!pPnp) + { + RegCloseKey(hKey); + return E_FAIL; + } + + if (RegQueryValueExW(hKey, L"PnpInstanceID", NULL, &dwType, (LPBYTE)pPnp, &dwSize) != ERROR_SUCCESS) + { + CoTaskMemFree(pPnp); + RegCloseKey(hKey); + return E_FAIL; + } + RegCloseKey(hKey); + + swprintf(szPath, L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Enum\\%s", pPnp); + CoTaskMemFree(pPnp); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + return E_FAIL; + + dwSize = 1; /* enable = 0, disable = 1 */ + RegSetValueExW(hKey, L"CSConfigFlags", 0, REG_DWORD, (LPBYTE)&dwSize, sizeof(DWORD)); + RegCloseKey(hKey); + + return S_OK; } HRESULT diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 7a9be00ad7..a5b4144dca 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -544,140 +544,14 @@ LANStatusUiAdvancedDlg( return FALSE; } -BOOL -FindNetworkAdapter(HDEVINFO hInfo, SP_DEVINFO_DATA *pDevInfo, LPWSTR pGuid) -{ - DWORD dwIndex, dwSize; - HKEY hSubKey; - WCHAR szNetCfg[50]; - WCHAR szDetail[200] = L"SYSTEM\\CurrentControlSet\\Control\\Class\\"; - - dwIndex = 0; - do - { - - ZeroMemory(pDevInfo, sizeof(SP_DEVINFO_DATA)); - pDevInfo->cbSize = sizeof(SP_DEVINFO_DATA); - - /* get device info */ - if (!SetupDiEnumDeviceInfo(hInfo, dwIndex++, pDevInfo)) - break; - - /* get device software registry path */ - if (!SetupDiGetDeviceRegistryPropertyW(hInfo, pDevInfo, SPDRP_DRIVER, NULL, (LPBYTE)&szDetail[39], sizeof(szDetail)/sizeof(WCHAR) - 40, &dwSize)) - break; - - /* open device registry key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szDetail, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) - break; - - /* query NetCfgInstanceId for current device */ - dwSize = sizeof(szNetCfg); - if (RegQueryValueExW(hSubKey, L"NetCfgInstanceId", NULL, NULL, (LPBYTE)szNetCfg, &dwSize) != ERROR_SUCCESS) - { - RegCloseKey(hSubKey); - break; - } - RegCloseKey(hSubKey); - if (!_wcsicmp(pGuid, szNetCfg)) - { - return TRUE; - } - } while (TRUE); - - return FALSE; -} - VOID DisableNetworkAdapter(INetConnection * pNet, LANSTATUSUI_CONTEXT * pContext, HWND hwndDlg) { - HKEY hKey; - NETCON_PROPERTIES * pProperties; - LPOLESTR pDisplayName; - WCHAR szPath[200]; - DWORD dwSize, dwType; - LPWSTR pPnp; - HDEVINFO hInfo; - SP_DEVINFO_DATA DevInfo; - SP_PROPCHANGE_PARAMS PropChangeParams; - BOOL bClose = FALSE; - NOTIFYICONDATAW nid; - - if (FAILED(pNet->GetProperties(&pProperties))) - return; - - - hInfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT ); - if (!hInfo) - { - NcFreeNetconProperties(pProperties); - return; - } - - if (FAILED(StringFromCLSID((CLSID)pProperties->guidId, &pDisplayName))) - { - NcFreeNetconProperties(pProperties); - SetupDiDestroyDeviceInfoList(hInfo); - return; - } - NcFreeNetconProperties(pProperties); - - if (FindNetworkAdapter(hInfo, &DevInfo, pDisplayName)) - { - PropChangeParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); - PropChangeParams.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; //; - PropChangeParams.StateChange = DICS_DISABLE; - PropChangeParams.Scope = DICS_FLAG_CONFIGSPECIFIC; - PropChangeParams.HwProfile = 0; - - if (SetupDiSetClassInstallParams(hInfo, &DevInfo, &PropChangeParams.ClassInstallHeader, sizeof(SP_PROPCHANGE_PARAMS))) - { - if (SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, hInfo, &DevInfo)) - bClose = TRUE; - } - } - SetupDiDestroyDeviceInfoList(hInfo); - - swprintf(szPath, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pDisplayName); - CoTaskMemFree(pDisplayName); - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) - return; - - dwSize = 0; - if (RegQueryValueExW(hKey, L"PnpInstanceID", NULL, &dwType, NULL, &dwSize) != ERROR_SUCCESS || dwType != REG_SZ) - { - RegCloseKey(hKey); - return; - } - - pPnp = static_cast<PWSTR>(CoTaskMemAlloc(dwSize)); - if (!pPnp) - { - RegCloseKey(hKey); - return; - } - - if (RegQueryValueExW(hKey, L"PnpInstanceID", NULL, &dwType, (LPBYTE)pPnp, &dwSize) != ERROR_SUCCESS) - { - CoTaskMemFree(pPnp); - RegCloseKey(hKey); - return; - } - RegCloseKey(hKey); - - swprintf(szPath, L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Enum\\%s", pPnp); - CoTaskMemFree(pPnp); - - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + HRESULT hr = pNet->Disconnect(); + if (FAILED_UNEXPECTEDLY(hr)) return; - dwSize = 1; /* enable = 0, disable = 1 */ - RegSetValueExW(hKey, L"CSConfigFlags", 0, REG_DWORD, (LPBYTE)&dwSize, sizeof(DWORD)); - RegCloseKey(hKey); - - if (!bClose) - return; + NOTIFYICONDATAW nid; PropSheet_PressButton(GetParent(hwndDlg), PSBTN_CANCEL); ZeroMemory(&nid, sizeof(nid));

6 years, 1 month

06/09: [NETSHELL] CNetConUiObject: Implement the Connect and Disconnect context menu items

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=132463abf20d379e6d3e7… commit 132463abf20d379e6d3e7051b0718052c60b334b Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Nov 13 00:09:46 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 18 14:01:54 2018 +0200 [NETSHELL] CNetConUiObject: Implement the Connect and Disconnect context menu items --- dll/shellext/netshell/shfldr_netconnect.cpp | 36 ++++++++++++++++------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index 8f553d289b..a3398f36ec 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -477,7 +477,7 @@ HRESULT WINAPI CNetConUiObject::QueryContextMenu( return E_FAIL; } - if (pdata->Status == NCS_HARDWARE_DISABLED) + if (pdata->Status == NCS_HARDWARE_DISABLED || pdata->Status == NCS_MEDIA_DISCONNECTED || pdata->Status == NCS_DISCONNECTED) _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_ACTIVATE), MFS_DEFAULT); else _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 1, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DEACTIVATE), MFS_ENABLED); @@ -622,13 +622,6 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) switch(CmdId) { - case IDS_NET_ACTIVATE: - case IDS_NET_DEACTIVATE: - case IDS_NET_REPAIR: - case IDS_NET_CREATELINK: - case IDS_NET_DELETE: - FIXME("Command %u is not implemented\n", CmdId); - return E_NOTIMPL; case IDS_NET_RENAME: { HRESULT hr; @@ -646,17 +639,28 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { return ShowNetConnectionStatus(m_lpOleCmd, m_pidl, lpcmi->hwnd); } - case IDS_NET_PROPERTIES: - { - HRESULT hr; - CComPtr<INetConnection> pCon; + case IDS_NET_REPAIR: + case IDS_NET_CREATELINK: + case IDS_NET_DELETE: + FIXME("Command %u is not implemented\n", CmdId); + return E_NOTIMPL; + } - hr = ILGetConnection(m_pidl, &pCon); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + HRESULT hr; + CComPtr<INetConnection> pCon; + + hr = ILGetConnection(m_pidl, &pCon); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + switch(CmdId) + { + case IDS_NET_ACTIVATE: + return pCon->Connect(); + case IDS_NET_DEACTIVATE: + return pCon->Disconnect(); + case IDS_NET_PROPERTIES: return ShowNetConnectionProperties(pCon, lpcmi->hwnd); - } } return E_NOTIMPL;

6 years, 1 month

05/09: [NETSHELL] Optionally use the system's CLSID_ConnectionManager Use a central compile option like we do in the rest of the shell so that when testing in windows we can switch using the one in the current dll or the one registered in the system. Note that not only CLSID_ConnectionManager isn't implemented in netshell, it can't even be instantiated as CLSCTX_INPROC_SERVER because it is implemented by the netman service

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7506198780ca48fcf0584… commit 7506198780ca48fcf05844403fdc3d611f15c47a Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Nov 13 00:08:18 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 18 14:01:54 2018 +0200 [NETSHELL] Optionally use the system's CLSID_ConnectionManager Use a central compile option like we do in the rest of the shell so that when testing in windows we can switch using the one in the current dll or the one registered in the system. Note that not only CLSID_ConnectionManager isn't implemented in netshell, it can't even be instantiated as CLSCTX_INPROC_SERVER because it is implemented by the netman service --- dll/shellext/netshell/connectmanager.cpp | 4 ++++ dll/shellext/netshell/precomp.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dll/shellext/netshell/connectmanager.cpp b/dll/shellext/netshell/connectmanager.cpp index 88780be11d..da733db2da 100644 --- a/dll/shellext/netshell/connectmanager.cpp +++ b/dll/shellext/netshell/connectmanager.cpp @@ -559,5 +559,9 @@ HRESULT CNetConnectionManager::Initialize() HRESULT WINAPI CNetConnectionManager_CreateInstance(REFIID riid, LPVOID * ppv) { +#if USE_CUSTOM_CONMGR return ShellObjectCreatorInit<CNetConnectionManager>(riid, ppv); +#else + return CoCreateInstance(CLSID_ConnectionManager, NULL, CLSCTX_ALL, riid, ppv); +#endif } diff --git a/dll/shellext/netshell/precomp.h b/dll/shellext/netshell/precomp.h index f568da7528..7dc020ca44 100644 --- a/dll/shellext/netshell/precomp.h +++ b/dll/shellext/netshell/precomp.h @@ -49,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #define NCF_FILTER 0x400 #define NCF_NDIS_PROTOCOL 0x4000 +#define USE_CUSTOM_CONMGR 1 + /* globals */ extern HINSTANCE netshell_hInstance;

6 years, 1 month

04/09: [NETSHELL] Rewrite how pidls are created and accessed. What we did before was completely wrong as we stored pointers in the pidl.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21a5a559f26bf808dc2f0… commit 21a5a559f26bf808dc2f05d28f55d10a63486db2 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Nov 12 22:52:57 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 18 14:01:54 2018 +0200 [NETSHELL] Rewrite how pidls are created and accessed. What we did before was completely wrong as we stored pointers in the pidl. --- dll/shellext/netshell/enumlist.cpp | 205 +++++++++--------- dll/shellext/netshell/precomp.h | 26 ++- dll/shellext/netshell/shfldr_netconnect.cpp | 312 +++++++++------------------- 3 files changed, 225 insertions(+), 318 deletions(-) diff --git a/dll/shellext/netshell/enumlist.cpp b/dll/shellext/netshell/enumlist.cpp index 218817539e..a95eab776d 100644 --- a/dll/shellext/netshell/enumlist.cpp +++ b/dll/shellext/netshell/enumlist.cpp @@ -7,24 +7,118 @@ #include "precomp.h" +PNETCONIDSTRUCT ILGetConnData(PCITEMID_CHILD pidl) +{ + if (!pidl || !pidl->mkid.cb || pidl->mkid.abID[0] != 0x99) + return NULL; + return (PNETCONIDSTRUCT)(&pidl->mkid.abID[0]); +} -typedef struct tagGUIDStruct +PWCHAR ILGetConnName(PCITEMID_CHILD pidl) { - BYTE dummy; /* offset 01 is unknown */ - GUID guid; /* offset 02 */ -} GUIDStruct; + PNETCONIDSTRUCT pdata = ILGetConnData(pidl); + if (!pdata) + return NULL; + return (PWCHAR)&pidl->mkid.abID[pdata->uNameOffset]; +} -#define PT_GUID 0x1F +PWCHAR ILGetDeviceName(PCITEMID_CHILD pidl) +{ + PNETCONIDSTRUCT pdata = ILGetConnData(pidl); + if (!pdata) + return NULL; + return (PWCHAR)&pidl->mkid.abID[pdata->uDeviceNameOffset]; +} + +PITEMID_CHILD ILCreateNetConnectItem(INetConnection * pItem) +{ + PITEMID_CHILD pidl; + ULONG_PTR size; + NETCON_PROPERTIES * pProperties; + PNETCONIDSTRUCT pnetid; + PWCHAR pwchName; + + if (pItem->GetProperties(&pProperties) != S_OK) + return NULL; + + size = sizeof(WORD); /* nr of bytes in this item */ + size += sizeof(NETCONIDSTRUCT); + size += (wcslen(pProperties->pszwName) + 1) * sizeof(WCHAR); + size += (wcslen(pProperties->pszwDeviceName) + 1) * sizeof(WCHAR); + + /* Allocate enough memory for the trailing id which will indicate that this is a simple id */ + pidl = static_cast<LPITEMIDLIST>(SHAlloc(size + sizeof(SHITEMID))); + pidl->mkid.cb = (WORD)size; + pidl->mkid.abID[0] = 0x99; + + /* Copy the connection properties */ + pnetid = ILGetConnData(pidl); + pnetid->guidId = pProperties->guidId; + pnetid->Status = pProperties->Status; + pnetid->MediaType = pProperties->MediaType; + pnetid->dwCharacter = pProperties->dwCharacter; + pnetid->uNameOffset = sizeof(NETCONIDSTRUCT); + pnetid->uDeviceNameOffset = pnetid->uNameOffset + (wcslen(pProperties->pszwName) + 1) * sizeof(WCHAR); + + pwchName = ILGetConnName(pidl); + wcscpy(pwchName, pProperties->pszwName); + + pwchName = ILGetDeviceName(pidl); + wcscpy(pwchName, pProperties->pszwDeviceName); + + /* Set the trailing id to null */ + memset((void*)((ULONG_PTR)pidl + size), 0, sizeof(SHITEMID)); + + NcFreeNetconProperties(pProperties); + + return pidl; +} -typedef struct tagPIDLDATA +HRESULT ILGetConnection(PCITEMID_CHILD pidl, INetConnection ** pItem) { - BYTE type; /*00*/ - union + HRESULT hr; + CComPtr<INetConnectionManager> pNetConMan; + CComPtr<IEnumNetConnection> pEnumCon; + CComPtr<INetConnection> INetCon; + ULONG Count; + NETCON_PROPERTIES * pProperties; + + PNETCONIDSTRUCT pdata = ILGetConnData(pidl); + if (!pdata) + return E_FAIL; + + /* get an instance to of IConnectionManager */ + hr = CNetConnectionManager_CreateInstance(IID_PPV_ARG(INetConnectionManager, &pNetConMan)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pNetConMan->EnumConnections(NCME_DEFAULT, &pEnumCon); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + while (TRUE) { - struct tagGUIDStruct guid; - struct tagVALUEStruct value; - } u; -} PIDLDATA, *LPPIDLDATA; + hr = pEnumCon->Next(1, &INetCon, &Count); + if (hr != S_OK) + return E_FAIL; + + hr = INetCon->GetProperties(&pProperties); + if (FAILED_UNEXPECTEDLY(hr)) + continue; + + BOOL bSame = !memcmp(&pProperties->guidId, &pdata->guidId, sizeof(GUID)); + + NcFreeNetconProperties(pProperties); + + if (bSame) + { + *pItem = INetCon.Detach(); + return S_OK; + } + } + + return E_FAIL; +} typedef struct tagENUMLIST { @@ -232,93 +326,6 @@ CEnumIDList::Clone( return E_NOTIMPL; } -LPPIDLDATA _ILGetDataPointer(LPITEMIDLIST pidl) -{ - if (pidl && pidl->mkid.cb != 0x00) - return reinterpret_cast<LPPIDLDATA>(&pidl->mkid.abID); - return NULL; -} - -LPITEMIDLIST _ILAlloc(BYTE type, unsigned int size) -{ - LPITEMIDLIST pidlOut = NULL; - - pidlOut = static_cast<LPITEMIDLIST>(SHAlloc(size + 5)); - if (pidlOut) - { - LPPIDLDATA pData; - - ZeroMemory(pidlOut, size + 5); - pidlOut->mkid.cb = size + 3; - pData = _ILGetDataPointer(pidlOut); - if (pData) - pData->type = type; - - } - - return pidlOut; -} - -PITEMID_CHILD _ILCreateNetConnect() -{ - PITEMID_CHILD pidlOut; - - pidlOut = _ILAlloc(PT_GUID, sizeof(PIDLDATA)); - if (pidlOut) - { - LPPIDLDATA pData = _ILGetDataPointer(pidlOut); - - memcpy(&(pData->u.guid.guid), &CLSID_ConnectionFolder, sizeof(GUID)); - } - return pidlOut; -} - -GUID* _ILGetGUIDPointer(LPITEMIDLIST pidl) -{ - LPPIDLDATA pdata = _ILGetDataPointer(pidl); - - if (!pdata) - return NULL; - - if (pdata->type != PT_GUID) - return NULL; - else - return &(pdata->u.guid.guid); - -} - -BOOL _ILIsNetConnect(LPCITEMIDLIST pidl) -{ - const IID *piid = _ILGetGUIDPointer(const_cast<LPITEMIDLIST>(pidl)); - - if (piid) - return IsEqualIID(*piid, CLSID_ConnectionFolder); - - return FALSE; -} - -PITEMID_CHILD ILCreateNetConnectItem(INetConnection * pItem) -{ - PITEMID_CHILD pidl; - LPPIDLDATA pdata; - - pidl = _ILAlloc(0x99, sizeof(PIDLDATA)); - pdata = _ILGetDataPointer(pidl); - pdata->u.value.pItem = pItem; - - return pidl; -} - -const VALUEStruct * _ILGetValueStruct(LPCITEMIDLIST pidl) -{ - LPPIDLDATA pdata = _ILGetDataPointer(const_cast<LPITEMIDLIST>(pidl)); - - if (pdata && pdata->type==0x99) - return reinterpret_cast<const VALUEStruct*>(&pdata->u.value); - - return NULL; -} - HRESULT CEnumIDList_CreateInstance(HWND hwndOwner, DWORD dwFlags, REFIID riid, LPVOID * ppv) { return ShellObjectCreatorInit<CEnumIDList>(riid, ppv); diff --git a/dll/shellext/netshell/precomp.h b/dll/shellext/netshell/precomp.h index a9553dc992..f568da7528 100644 --- a/dll/shellext/netshell/precomp.h +++ b/dll/shellext/netshell/precomp.h @@ -49,20 +49,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #define NCF_FILTER 0x400 #define NCF_NDIS_PROTOCOL 0x4000 -typedef struct tagVALUEStruct -{ - BYTE dummy; - INetConnection * pItem; -} VALUEStruct; - /* globals */ extern HINSTANCE netshell_hInstance; /* enumlist.c */ -PITEMID_CHILD _ILCreateNetConnect(void); -PITEMID_CHILD ILCreateNetConnectItem(INetConnection *pItem); -BOOL _ILIsNetConnect(LPCITEMIDLIST pidl); -const VALUEStruct * _ILGetValueStruct(LPCITEMIDLIST pidl); +typedef struct tagNETCONIDSTRUCT +{ + BYTE type; + GUID guidId; + NETCON_STATUS Status; + NETCON_MEDIATYPE MediaType; + DWORD dwCharacter; + ULONG_PTR uNameOffset; + ULONG_PTR uDeviceNameOffset; +} NETCONIDSTRUCT, *PNETCONIDSTRUCT; + +PNETCONIDSTRUCT ILGetConnData(PCITEMID_CHILD pidl); +PWCHAR ILGetConnName(PCITEMID_CHILD pidl); +PWCHAR ILGetDeviceName(PCITEMID_CHILD pidl); +PITEMID_CHILD ILCreateNetConnectItem(INetConnection * pItem); +HRESULT ILGetConnection(PCITEMID_CHILD pidl, INetConnection ** pItem); HRESULT CEnumIDList_CreateInstance(HWND hwndOwner, DWORD dwFlags, REFIID riid, LPVOID * ppv); #define NCCF_NOTIFY_DISCONNECTED 0x100000 diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index 39c5c44ed8..8f553d289b 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -51,10 +51,14 @@ static const shvheader NetConnectSFHeader[] = { #define COLUMN_PHONE 4 #define COLUMN_OWNER 5 -HRESULT ShowNetConnectionStatus(IOleCommandTarget * lpOleCmd, INetConnection * pNetConnect, HWND hwnd); +HRESULT +ShowNetConnectionStatus( + IOleCommandTarget *lpOleCmd, + PCUITEMID_CHILD pidl, + HWND hwnd); CNetworkConnections::CNetworkConnections() : - m_pidlRoot(_ILCreateNetConnect()) + m_pidlRoot(NULL) { HRESULT hr; hr = CoCreateInstance(CLSID_ConnectionTray, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IOleCommandTarget, &m_lpOleCmd)); @@ -64,7 +68,8 @@ CNetworkConnections::CNetworkConnections() : CNetworkConnections::~CNetworkConnections() { - SHFree(m_pidlRoot); + if (m_pidlRoot) + SHFree(m_pidlRoot); } /************************************************************************** @@ -181,17 +186,11 @@ HRESULT WINAPI CNetworkConnections::GetAttributesOf( while (cidl > 0 && *apidl) { - const VALUEStruct * val; - NETCON_PROPERTIES * pProperties; - - val = _ILGetValueStruct(*apidl); - if (!val) + PNETCONIDSTRUCT pdata = ILGetConnData(*apidl); + if (!pdata) continue; - if (val->pItem->GetProperties(&pProperties) != S_OK) - continue; - - if (!(pProperties->dwCharacter & NCCF_ALLOW_RENAME)) + if (!(pdata->dwCharacter & NCCF_ALLOW_RENAME)) *rgfInOut &= ~SFGAO_CANRENAME; apidl++; @@ -248,55 +247,20 @@ HRESULT WINAPI CNetworkConnections::GetUIObjectOf( */ HRESULT WINAPI CNetworkConnections::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { - LPWSTR pszName; - HRESULT hr = E_FAIL; - NETCON_PROPERTIES * pProperties; - const VALUEStruct * val; - if (!strRet) return E_INVALIDARG; - pszName = static_cast<LPWSTR>(CoTaskMemAlloc(MAX_PATH * sizeof(WCHAR))); - if (!pszName) - return E_OUTOFMEMORY; - - if (_ILIsNetConnect(pidl)) - { - if (LoadStringW(netshell_hInstance, IDS_NETWORKCONNECTION, pszName, MAX_PATH)) - { - pszName[MAX_PATH-1] = L'\0'; - hr = S_OK; - } - } - else - { - val = _ILGetValueStruct(pidl); - if (val) - { - if (val->pItem->GetProperties(&pProperties) == S_OK) - { - if (pProperties->pszwName) - { - wcscpy(pszName, pProperties->pszwName); - hr = S_OK; - } - NcFreeNetconProperties(pProperties); - } - } - - } + if (!pidl) + return SHSetStrRet(strRet, netshell_hInstance, IDS_NETWORKCONNECTION); - if (SUCCEEDED(hr)) - { - strRet->uType = STRRET_WSTR; - strRet->pOleStr = pszName; - } - else + PWCHAR pwchName = ILGetConnName(pidl); + if (!pwchName) { - CoTaskMemFree(pszName); + ERR("Got invalid pidl!\n"); + return E_INVALIDARG; } - return hr; + return SHSetStrRet(strRet, pwchName); } /************************************************************************** @@ -315,22 +279,20 @@ HRESULT WINAPI CNetworkConnections::SetNameOf ( HWND hwndOwner, PCUITEMID_CHILD pidl, /*simple pidl */ LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD * pPidlOut) { - const VALUEStruct * val; HRESULT hr; + CComPtr<INetConnection> pCon; - val = _ILGetValueStruct(pidl); - if (!val) - return E_FAIL; - - if (!val->pItem) - return E_FAIL; + hr = ILGetConnection(pidl, &pCon); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - hr = val->pItem->Rename(lpName); - if (FAILED(hr)) + hr = pCon->Rename(lpName); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - /* The pidl hasn't changed */ - *pPidlOut = ILClone(pidl); + *pPidlOut = ILCreateNetConnectItem(pCon); + if (*pPidlOut == NULL) + return E_FAIL; return S_OK; } @@ -372,97 +334,57 @@ HRESULT WINAPI CNetworkConnections::GetDetailsEx( HRESULT WINAPI CNetworkConnections::GetDetailsOf( PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS * psd) { - WCHAR buffer[MAX_PATH] = {0}; - HRESULT hr = E_FAIL; - const VALUEStruct * val; - NETCON_PROPERTIES * pProperties; - if (iColumn >= NETCONNECTSHELLVIEWCOLUMNS) return E_FAIL; psd->fmt = NetConnectSFHeader[iColumn].fmt; psd->cxChar = NetConnectSFHeader[iColumn].cxChar; if (pidl == NULL) - { - psd->str.uType = STRRET_WSTR; - if (LoadStringW(netshell_hInstance, NetConnectSFHeader[iColumn].colnameid, buffer, MAX_PATH)) - hr = SHStrDupW(buffer, &psd->str.pOleStr); - - return hr; - } + return SHSetStrRet(&psd->str, netshell_hInstance, NetConnectSFHeader[iColumn].colnameid); - if (iColumn == COLUMN_NAME) - { - psd->str.uType = STRRET_WSTR; - return GetDisplayNameOf(pidl, SHGDN_NORMAL, &psd->str); - } - - val = _ILGetValueStruct(pidl); - if (!val) + PNETCONIDSTRUCT pdata = ILGetConnData(pidl); + if (!pdata) return E_FAIL; - if (!val->pItem) - return E_FAIL; - - if (val->pItem->GetProperties(&pProperties) != S_OK) - return E_FAIL; - - switch (iColumn) { + case COLUMN_NAME: + return SHSetStrRet(&psd->str, ILGetConnName(pidl)); case COLUMN_TYPE: - if (pProperties->MediaType == NCM_LAN || pProperties->MediaType == NCM_SHAREDACCESSHOST_RAS) + if (pdata->MediaType == NCM_LAN || pdata->MediaType == NCM_SHAREDACCESSHOST_RAS) { - if (LoadStringW(netshell_hInstance, IDS_TYPE_ETHERNET, buffer, MAX_PATH)) - { - psd->str.uType = STRRET_WSTR; - hr = SHStrDupW(buffer, &psd->str.pOleStr); - } + return SHSetStrRet(&psd->str, netshell_hInstance, IDS_TYPE_ETHERNET); } - break; - case COLUMN_STATUS: - buffer[0] = L'\0'; - if (pProperties->Status == NCS_HARDWARE_DISABLED) - LoadStringW(netshell_hInstance, IDS_STATUS_NON_OPERATIONAL, buffer, MAX_PATH); - else if (pProperties->Status == NCS_DISCONNECTED) - LoadStringW(netshell_hInstance, IDS_STATUS_UNREACHABLE, buffer, MAX_PATH); - else if (pProperties->Status == NCS_MEDIA_DISCONNECTED) - LoadStringW(netshell_hInstance, IDS_STATUS_DISCONNECTED, buffer, MAX_PATH); - else if (pProperties->Status == NCS_CONNECTING) - LoadStringW(netshell_hInstance, IDS_STATUS_CONNECTING, buffer, MAX_PATH); - else if (pProperties->Status == NCS_CONNECTED) - LoadStringW(netshell_hInstance, IDS_STATUS_CONNECTED, buffer, MAX_PATH); - - if (buffer[0]) + else { - buffer[MAX_PATH-1] = L'\0'; - psd->str.uType = STRRET_WSTR; - hr = SHStrDupW(buffer, &psd->str.pOleStr); + return SHSetStrRet(&psd->str, ""); } break; - case COLUMN_DEVNAME: - if (pProperties->pszwDeviceName) - { - wcscpy(buffer, pProperties->pszwDeviceName); - buffer[MAX_PATH-1] = L'\0'; - psd->str.uType = STRRET_WSTR; - hr = SHStrDupW(buffer, &psd->str.pOleStr); - } - else + case COLUMN_STATUS: + switch(pdata->Status) { - psd->str.cStr[0] = '\0'; - psd->str.uType = STRRET_CSTR; + case NCS_HARDWARE_DISABLED: + return SHSetStrRet(&psd->str, netshell_hInstance, IDS_STATUS_NON_OPERATIONAL); + case NCS_DISCONNECTED: + return SHSetStrRet(&psd->str, netshell_hInstance, IDS_STATUS_UNREACHABLE); + case NCS_MEDIA_DISCONNECTED: + return SHSetStrRet(&psd->str, netshell_hInstance, IDS_STATUS_DISCONNECTED); + case NCS_CONNECTING: + return SHSetStrRet(&psd->str, netshell_hInstance, IDS_STATUS_CONNECTING); + case NCS_CONNECTED: + return SHSetStrRet(&psd->str, netshell_hInstance, IDS_STATUS_CONNECTED); + default: + return SHSetStrRet(&psd->str, ""); } break; + case COLUMN_DEVNAME: + return SHSetStrRet(&psd->str, ILGetDeviceName(pidl)); case COLUMN_PHONE: case COLUMN_OWNER: - psd->str.cStr[0] = '\0'; - psd->str.uType = STRRET_CSTR; - break; + return SHSetStrRet(&psd->str, ""); } - NcFreeNetconProperties(pProperties); - return hr; + return E_FAIL; } HRESULT WINAPI CNetworkConnections::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) @@ -548,29 +470,26 @@ HRESULT WINAPI CNetConUiObject::QueryContextMenu( UINT idCmdLast, UINT uFlags) { - const VALUEStruct * val; - NETCON_PROPERTIES * pProperties; - - val = _ILGetValueStruct(m_pidl); - if (!val) - return E_FAIL; - - if (val->pItem->GetProperties(&pProperties) != S_OK) + PNETCONIDSTRUCT pdata = ILGetConnData(m_pidl); + if (!pdata) + { + ERR("Got invalid pidl!\n"); return E_FAIL; + } - if (pProperties->Status == NCS_HARDWARE_DISABLED) + if (pdata->Status == NCS_HARDWARE_DISABLED) _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_ACTIVATE), MFS_DEFAULT); else _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 1, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DEACTIVATE), MFS_ENABLED); - if (pProperties->Status == NCS_HARDWARE_DISABLED || pProperties->Status == NCS_MEDIA_DISCONNECTED || pProperties->Status == NCS_DISCONNECTED) + if (pdata->Status == NCS_HARDWARE_DISABLED || pdata->Status == NCS_MEDIA_DISCONNECTED || pdata->Status == NCS_DISCONNECTED) _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 2, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_GRAYED); - else if (pProperties->Status == NCS_CONNECTED) + else if (pdata->Status == NCS_CONNECTED) _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 2, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_DEFAULT); else _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 2, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_STATUS), MFS_ENABLED); - if (pProperties->Status == NCS_HARDWARE_DISABLED || pProperties->Status == NCS_MEDIA_DISCONNECTED) + if (pdata->Status == NCS_HARDWARE_DISABLED || pdata->Status == NCS_MEDIA_DISCONNECTED) _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 3, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_REPAIR), MFS_GRAYED); else _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 3, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_REPAIR), MFS_ENABLED); @@ -578,22 +497,22 @@ HRESULT WINAPI CNetConUiObject::QueryContextMenu( _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 4, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_CREATELINK), MFS_ENABLED); - if (pProperties->dwCharacter & NCCF_ALLOW_REMOVAL) + if (pdata->dwCharacter & NCCF_ALLOW_REMOVAL) _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 5, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_ENABLED); else _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 5, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_DELETE), MFS_GRAYED); - if (pProperties->dwCharacter & NCCF_ALLOW_RENAME) + if (pdata->dwCharacter & NCCF_ALLOW_RENAME) _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 6, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_ENABLED); else _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 6, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_RENAME), MFS_GRAYED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); - if (pProperties->Status == NCS_CONNECTED) + if (pdata->Status == NCS_CONNECTED) _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); else _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + 7, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_DEFAULT); - NcFreeNetconProperties(pProperties); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); } @@ -614,22 +533,20 @@ PropSheetExCallback(HPROPSHEETPAGE hPage, LPARAM lParam) HRESULT ShowNetConnectionStatus( IOleCommandTarget *lpOleCmd, - INetConnection *pNetConnect, + PCUITEMID_CHILD pidl, HWND hwnd) { - NETCON_PROPERTIES *pProperties; - HRESULT hr; - if (!lpOleCmd) return E_FAIL; - if (pNetConnect->GetProperties(&pProperties) != S_OK) + PNETCONIDSTRUCT pdata = ILGetConnData(pidl); + if (!pdata) + { + ERR("Got invalid pidl!\n"); return E_FAIL; + } - hr = lpOleCmd->Exec(&pProperties->guidId, OLECMDID_NEW, OLECMDEXECOPT_DODEFAULT, NULL, NULL); - - NcFreeNetconProperties(pProperties); - return hr; + return lpOleCmd->Exec(&pdata->guidId, OLECMDID_NEW, OLECMDEXECOPT_DODEFAULT, NULL, NULL); } HRESULT @@ -689,13 +606,8 @@ ShowNetConnectionProperties( */ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { - const VALUEStruct * val; UINT CmdId; - val = _ILGetValueStruct(m_pidl); - if (!val) - return E_FAIL; - /* We should get this when F2 is pressed in explorer */ if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, "rename")) lpcmi->lpVerb = MAKEINTRESOURCEA(IDS_NET_RENAME); @@ -731,9 +643,20 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) return S_OK; } case IDS_NET_STATUS: - return ShowNetConnectionStatus(m_lpOleCmd, val->pItem, lpcmi->hwnd); + { + return ShowNetConnectionStatus(m_lpOleCmd, m_pidl, lpcmi->hwnd); + } case IDS_NET_PROPERTIES: - return ShowNetConnectionProperties(val->pItem, lpcmi->hwnd); + { + HRESULT hr; + CComPtr<INetConnection> pCon; + + hr = ILGetConnection(m_pidl, &pCon); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return ShowNetConnectionProperties(pCon, lpcmi->hwnd); + } } return E_NOTIMPL; @@ -800,9 +723,6 @@ HRESULT WINAPI CNetConUiObject::GetIconLocation( int *piIndex, UINT *pwFlags) { - const VALUEStruct *val; - NETCON_PROPERTIES *pProperties; - *pwFlags = 0; if (!GetModuleFileNameW(netshell_hInstance, szIconFile, cchMax)) { @@ -810,27 +730,19 @@ HRESULT WINAPI CNetConUiObject::GetIconLocation( return E_FAIL; } - val = _ILGetValueStruct(m_pidl); - if (!val) - { - ERR("_ILGetValueStruct failed\n"); - return E_FAIL; - } - - if (val->pItem->GetProperties(&pProperties) != NOERROR) + PNETCONIDSTRUCT pdata = ILGetConnData(m_pidl); + if (!pdata) { - ERR("INetConnection_GetProperties failed\n"); + ERR("Got invalid pidl!\n"); return E_FAIL; } - if (pProperties->Status == NCS_CONNECTED || pProperties->Status == NCS_CONNECTING) + if (pdata->Status == NCS_CONNECTED || pdata->Status == NCS_CONNECTING) *piIndex = -IDI_NET_IDLE; else *piIndex = -IDI_NET_OFF; - NcFreeNetconProperties(pProperties); - - return NOERROR; + return S_OK; } /************************************************************************ @@ -843,21 +755,7 @@ HRESULT WINAPI CNetConUiObject::Extract( HICON *phiconSmall, UINT nIconSize) { - //IContextMenuImpl * This = impl_from_IExtractIcon(iface); - if (nIconIndex == IDI_NET_IDLE) - { - *phiconLarge = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); - *phiconSmall = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - return NOERROR; - } - else if (nIconIndex == IDI_NET_OFF) - { - *phiconLarge = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); - *phiconSmall = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - return NOERROR; - } - - return S_FALSE; + return SHDefExtractIconW(pszFile, nIconIndex, 0, phiconLarge, phiconSmall, nIconSize); } /************************************************************************ @@ -880,7 +778,8 @@ HRESULT WINAPI CNetworkConnections::GetClassID(CLSID *lpClassId) */ HRESULT WINAPI CNetworkConnections::Initialize(PCIDLIST_ABSOLUTE pidl) { - SHFree(m_pidlRoot); + if (m_pidlRoot) + SHFree(m_pidlRoot); m_pidlRoot = ILClone(pidl); return S_OK; @@ -904,24 +803,19 @@ HRESULT WINAPI CNetworkConnections::GetCurFolder(PIDLIST_ABSOLUTE *pidl) */ HRESULT WINAPI CNetworkConnections::Execute(LPSHELLEXECUTEINFOW pei) { - const VALUEStruct *val; - NETCON_PROPERTIES * pProperties; - - val = _ILGetValueStruct(ILFindLastID((ITEMIDLIST*)pei->lpIDList)); - if (!val) - return E_FAIL; - - if (val->pItem->GetProperties(&pProperties) != NOERROR) + PCUITEMID_CHILD pidl = ILFindLastID((ITEMIDLIST*)pei->lpIDList); + PNETCONIDSTRUCT pdata = ILGetConnData(pidl); + if (!pdata) + { + ERR("Got invalid pidl!\n"); return E_FAIL; + } - if (pProperties->Status == NCS_CONNECTED) + if (pdata->Status == NCS_CONNECTED) { - NcFreeNetconProperties(pProperties); - return ShowNetConnectionStatus(m_lpOleCmd, val->pItem, pei->hwnd); + return ShowNetConnectionStatus(m_lpOleCmd, pidl, pei->hwnd); } - NcFreeNetconProperties(pProperties); - return S_OK; }

6 years, 1 month

03/09: [NETSHELL] Use smart pointers and IID_PPV_ARG

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=769b102e5f7c5e5777b38… commit 769b102e5f7c5e5777b384a1885ab6da2a45b378 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Nov 12 16:46:45 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 18 14:01:54 2018 +0200 [NETSHELL] Use smart pointers and IID_PPV_ARG --- dll/shellext/netshell/enumlist.cpp | 41 +++---- dll/shellext/netshell/lanconnectui.cpp | 89 ++++++--------- dll/shellext/netshell/lanconnectui.h | 6 +- dll/shellext/netshell/lanstatusui.cpp | 164 +++++++++++++--------------- dll/shellext/netshell/lanstatusui.h | 2 +- dll/shellext/netshell/shfldr_netconnect.cpp | 73 +++---------- dll/shellext/netshell/shfldr_netconnect.h | 6 +- 7 files changed, 149 insertions(+), 232 deletions(-) diff --git a/dll/shellext/netshell/enumlist.cpp b/dll/shellext/netshell/enumlist.cpp index c4e5de37a7..218817539e 100644 --- a/dll/shellext/netshell/enumlist.cpp +++ b/dll/shellext/netshell/enumlist.cpp @@ -124,45 +124,36 @@ HRESULT CEnumIDList::Initialize() { HRESULT hr; - INetConnectionManager *pNetConMan; - IEnumNetConnection *pEnumCon; - INetConnection *INetCon; + CComPtr<INetConnectionManager> pNetConMan; + CComPtr<IEnumNetConnection> pEnumCon; ULONG Count; PITEMID_CHILD pidl; /* get an instance to of IConnectionManager */ - hr = CNetConnectionManager_CreateInstance(IID_INetConnectionManager, (LPVOID*)&pNetConMan); - if (FAILED(hr)) + hr = CNetConnectionManager_CreateInstance(IID_PPV_ARG(INetConnectionManager, &pNetConMan)); + if (FAILED_UNEXPECTEDLY(hr)) return S_OK; hr = pNetConMan->EnumConnections(NCME_DEFAULT, &pEnumCon); - if (FAILED(hr)) - { - pNetConMan->Release(); + if (FAILED_UNEXPECTEDLY(hr)) return S_OK; - } - do + while (TRUE) { + CComPtr<INetConnection> INetCon; + hr = pEnumCon->Next(1, &INetCon, &Count); - if (hr == S_OK) - { - pidl = ILCreateNetConnectItem(INetCon); - if (pidl) - { - AddToEnumList(pidl); - } - } - else - { + if (hr != S_OK) break; - } - } while (TRUE); - pEnumCon->Release(); - pNetConMan->Release(); + pidl = ILCreateNetConnectItem(INetCon); + if (pidl) + { + AddToEnumList(pidl); + } + } - return S_OK; + return S_OK; } HRESULT diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index 60e25f0363..6c1c0f281e 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -8,9 +8,6 @@ #include "precomp.h" CNetConnectionPropertyUi::CNetConnectionPropertyUi() : - m_pCon(NULL), - m_NCfgLock(NULL), - m_pNCfg(NULL), m_pProperties(NULL) { } @@ -18,18 +15,10 @@ CNetConnectionPropertyUi::CNetConnectionPropertyUi() : CNetConnectionPropertyUi::~CNetConnectionPropertyUi() { if (m_pNCfg) - { m_pNCfg->Uninitialize(); - m_pNCfg->Release(); - } - if (m_NCfgLock) - { - m_NCfgLock->Release(); - } + if (m_pProperties) - { NcFreeNetconProperties(m_pProperties); - } } VOID @@ -51,32 +40,31 @@ CNetConnectionPropertyUi::GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent * { LPWSTR pName; HRESULT hr; - INetCfgComponent * pNCg; ULONG Fetched; - IEnumNetCfgComponent * pEnumCfg; + CComPtr<IEnumNetCfgComponent> pEnumCfg; hr = pNCfg->EnumComponents(&GUID_DEVCLASS_NET, &pEnumCfg); - if (FAILED(hr)) - { + if (FAILED_UNEXPECTEDLY(hr)) return FALSE; - } - while (pEnumCfg->Next(1, &pNCg, &Fetched) == S_OK) + while (TRUE) { + CComPtr<INetCfgComponent> pNCg; + hr = pEnumCfg->Next(1, &pNCg, &Fetched); + if (hr != S_OK) + break; + hr = pNCg->GetDisplayName(&pName); if (SUCCEEDED(hr)) { if (!_wcsicmp(pName, m_pProperties->pszwDeviceName)) { - *pOut = pNCg; - pEnumCfg->Release(); + *pOut = pNCg.Detach(); return TRUE; } CoTaskMemFree(pName); } - pNCg->Release(); } - pEnumCfg->Release(); return FALSE; } @@ -84,9 +72,7 @@ VOID CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type) { HRESULT hr; - IEnumNetCfgComponent * pENetCfg; - INetCfgComponent *pNCfgComp, *pAdapterCfgComp; - INetCfgComponentBindings * pCompBind; + CComPtr<IEnumNetCfgComponent> pENetCfg; ULONG Num; DWORD dwCharacteristics; LPOLESTR pDisplayName, pHelpText; @@ -94,25 +80,29 @@ CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GU BOOL bChecked; hr = pNCfg->EnumComponents(CompGuid, &pENetCfg); - if (FAILED(hr)) - { - pNCfg->Release(); + if (FAILED_UNEXPECTEDLY(hr)) return; - } - while (pENetCfg->Next(1, &pNCfgComp, &Num) == S_OK) + + while (TRUE) { + CComPtr<INetCfgComponent> pNCfgComp; + CComPtr<INetCfgComponentBindings> pCompBind; + CComPtr<INetCfgComponent> pAdapterCfgComp; + + hr = pENetCfg->Next(1, &pNCfgComp, &Num); + if (hr != S_OK) + break; + hr = pNCfgComp->GetCharacteristics(&dwCharacteristics); if (SUCCEEDED(hr) && (dwCharacteristics & NCF_HIDDEN)) - { - pNCfgComp->Release(); continue; - } + pDisplayName = NULL; pHelpText = NULL; hr = pNCfgComp->GetDisplayName(&pDisplayName); hr = pNCfgComp->GetHelpText(&pHelpText); bChecked = TRUE; //ReactOS hack - hr = pNCfgComp->QueryInterface(IID_INetCfgComponentBindings, (LPVOID*)&pCompBind); + hr = pNCfgComp->QueryInterface(IID_PPV_ARG(INetCfgComponentBindings, &pCompBind)); if (SUCCEEDED(hr)) { if (GetINetCfgComponent(pNCfg, &pAdapterCfgComp)) @@ -122,8 +112,6 @@ CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GU bChecked = TRUE; else bChecked = FALSE; - pAdapterCfgComp->Release(); - pCompBind->Release(); } } @@ -134,21 +122,20 @@ CNetConnectionPropertyUi::EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GU pItem->dwCharacteristics = dwCharacteristics; pItem->szHelp = pHelpText; pItem->Type = (NET_TYPE)Type; - pItem->pNCfgComp = pNCfgComp; + pItem->pNCfgComp = pNCfgComp.Detach(); pItem->NumPropDialogOpen = 0; AddItemToListView(hDlgCtrl, pItem, pDisplayName, bChecked); CoTaskMemFree(pDisplayName); } - pENetCfg->Release(); } VOID CNetConnectionPropertyUi::InitializeLANPropertiesUIDlg(HWND hwndDlg) { HRESULT hr; - INetCfg *pNCfg; - INetCfgLock *pNCfgLock; + CComPtr<INetCfg> pNCfg; + CComPtr<INetCfgLock> pNCfgLock; HWND hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMPONENTSLIST); LVCOLUMNW lc; RECT rc; @@ -182,11 +169,11 @@ CNetConnectionPropertyUi::InitializeLANPropertiesUIDlg(HWND hwndDlg) dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; SendMessage(hDlgCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); - hr = CoCreateInstance(CLSID_CNetCfg, NULL, CLSCTX_INPROC_SERVER, IID_INetCfg, (LPVOID*)&pNCfg); + hr = CoCreateInstance(CLSID_CNetCfg, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(INetCfg, &pNCfg)); if (FAILED(hr)) return; - hr = pNCfg->QueryInterface(IID_INetCfgLock, (LPVOID*)&pNCfgLock); + hr = pNCfg->QueryInterface(IID_PPV_ARG(INetCfgLock, &pNCfgLock)); hr = pNCfgLock->AcquireWriteLock(100, L"", &pDisplayName); if (hr == S_FALSE) { @@ -194,18 +181,16 @@ CNetConnectionPropertyUi::InitializeLANPropertiesUIDlg(HWND hwndDlg) return; } - m_NCfgLock = pNCfgLock; hr = pNCfg->Initialize(NULL); - if (FAILED(hr)) - { - pNCfg->Release(); + if (FAILED_UNEXPECTEDLY(hr)) return; - } + + m_pNCfg = pNCfg; + m_NCfgLock = pNCfgLock; EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETCLIENT, NET_TYPE_CLIENT); EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETSERVICE, NET_TYPE_SERVICE); EnumComponents(hDlgCtrl, pNCfg, &GUID_DEVCLASS_NETTRANS, NET_TYPE_PROTOCOL); - m_pNCfg = pNCfg; ZeroMemory(&li, sizeof(li)); li.mask = LVIF_STATE; @@ -459,7 +444,7 @@ CNetConnectionPropertyUi::AddPages( return E_FAIL; hr = m_pCon->GetProperties(&m_pProperties); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, reinterpret_cast<LPARAM>(this), NULL); @@ -499,15 +484,10 @@ HRESULT WINAPI CNetConnectionPropertyUi::SetConnection(INetConnection* pCon) { - if (m_pCon) - m_pCon->Release(); - if (!pCon) return E_POINTER; m_pCon = pCon; - - pCon->AddRef(); return S_OK; } @@ -520,7 +500,6 @@ CNetConnectionPropertyUi::Connect( if (!m_pCon) return E_POINTER; //FIXME - if (dwFlags & NCUC_NO_UI) return m_pCon->Connect(); diff --git a/dll/shellext/netshell/lanconnectui.h b/dll/shellext/netshell/lanconnectui.h index 02c8a8051b..6e8b927187 100644 --- a/dll/shellext/netshell/lanconnectui.h +++ b/dll/shellext/netshell/lanconnectui.h @@ -50,9 +50,9 @@ class CNetConnectionPropertyUi: BOOL GetDeviceInstanceID(OUT LPOLESTR *DeviceInstanceID); static INT_PTR CALLBACK LANPropertiesUIDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - INetConnection * m_pCon; - INetCfgLock *m_NCfgLock; - INetCfg * m_pNCfg; + CComPtr<INetConnection> m_pCon; + CComPtr<INetCfgLock> m_NCfgLock; + CComPtr<INetCfg> m_pNCfg; NETCON_PROPERTIES * m_pProperties; public: diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 2aa7cc0237..7a9be00ad7 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -903,9 +903,9 @@ CLanStatus::InitializeNetTaskbarNotifications() { NOTIFYICONDATAW nid; HWND hwndDlg; - INetConnectionManager *pNetConMan; - IEnumNetConnection *pEnumCon; - INetConnection *pNetCon; + CComPtr<INetConnectionManager> pNetConMan; + CComPtr<IEnumNetConnection> pEnumCon; + CComPtr<INetConnection> pNetCon; NETCON_PROPERTIES* pProps; HRESULT hr; ULONG Count; @@ -942,108 +942,100 @@ CLanStatus::InitializeNetTaskbarNotifications() return S_OK; } /* get an instance to of IConnectionManager */ - - //hr = CoCreateInstance(&CLSID_ConnectionManager, NULL, CLSCTX_INPROC_SERVER, &IID_INetConnectionManager, (LPVOID*)&pNetConMan); - - hr = CNetConnectionManager_CreateInstance(IID_INetConnectionManager, (LPVOID*)&pNetConMan); - if (FAILED(hr)) - { - ERR("CNetConnectionManager_CreateInstance failed\n"); + hr = CNetConnectionManager_CreateInstance(IID_PPV_ARG(INetConnectionManager, &pNetConMan)); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - } hr = pNetConMan->EnumConnections(NCME_DEFAULT, &pEnumCon); - if (FAILED(hr)) - { - ERR("EnumConnections failed\n"); - pNetConMan->Release(); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - } Index = 1; - do + while (TRUE) { hr = pEnumCon->Next(1, &pNetCon, &Count); - if (hr == S_OK) + if (hr != S_OK) + break; + + TRACE("new connection\n"); + pItem = static_cast<NOTIFICATION_ITEM*>(CoTaskMemAlloc(sizeof(NOTIFICATION_ITEM))); + if (!pItem) + break; + + pContext = static_cast<LANSTATUSUI_CONTEXT*>(CoTaskMemAlloc(sizeof(LANSTATUSUI_CONTEXT))); + if (!pContext) { - TRACE("new connection\n"); - pItem = static_cast<NOTIFICATION_ITEM*>(CoTaskMemAlloc(sizeof(NOTIFICATION_ITEM))); - if (!pItem) - break; + CoTaskMemFree(pItem); + break; + } - pContext = static_cast<LANSTATUSUI_CONTEXT*>(CoTaskMemAlloc(sizeof(LANSTATUSUI_CONTEXT))); - if (!pContext) - { - CoTaskMemFree(pItem); - break; - } + ZeroMemory(pContext, sizeof(LANSTATUSUI_CONTEXT)); + pContext->uID = Index; + pContext->pNet = pNetCon; + pItem->uID = Index; + pItem->pNext = NULL; + pItem->pNet = pNetCon; + pNetCon->AddRef(); + hwndDlg = CreateDialogParamW(netshell_hInstance, MAKEINTRESOURCEW(IDD_STATUS), NULL, LANStatusDlg, (LPARAM)pContext); + if (!hwndDlg) + { + ERR("CreateDialogParamW failed\n"); + continue; + } - ZeroMemory(pContext, sizeof(LANSTATUSUI_CONTEXT)); - pContext->uID = Index; - pContext->pNet = pNetCon; - pItem->uID = Index; - pItem->pNext = NULL; - pItem->pNet = pNetCon; - hwndDlg = CreateDialogParamW(netshell_hInstance, MAKEINTRESOURCEW(IDD_STATUS), NULL, LANStatusDlg, (LPARAM)pContext); - if (hwndDlg) - { - ZeroMemory(&nid, sizeof(nid)); - nid.cbSize = sizeof(nid); - nid.uID = Index++; - nid.uFlags = NIF_MESSAGE; - nid.uVersion = NOTIFYICON_VERSION; - nid.uCallbackMessage = WM_SHOWSTATUSDLG; - nid.hWnd = hwndDlg; - - hr = pNetCon->GetProperties(&pProps); - if (SUCCEEDED(hr)) - { - CopyMemory(&pItem->guidItem, &pProps->guidId, sizeof(GUID)); - if (!(pProps->dwCharacter & NCCF_SHOW_ICON)) - { - nid.dwState = NIS_HIDDEN; - nid.dwStateMask = NIS_HIDDEN; - nid.uFlags |= NIF_STATE; - } - if (pProps->Status == NCS_MEDIA_DISCONNECTED || pProps->Status == NCS_DISCONNECTED || pProps->Status == NCS_HARDWARE_DISABLED) - nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF)); - else if (pProps->Status == NCS_CONNECTED) - nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE)); + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uID = Index++; + nid.uFlags = NIF_MESSAGE; + nid.uVersion = NOTIFYICON_VERSION; + nid.uCallbackMessage = WM_SHOWSTATUSDLG; + nid.hWnd = hwndDlg; - if (nid.hIcon) - nid.uFlags |= NIF_ICON; + hr = pNetCon->GetProperties(&pProps); + if (SUCCEEDED(hr)) + { + CopyMemory(&pItem->guidItem, &pProps->guidId, sizeof(GUID)); + if (!(pProps->dwCharacter & NCCF_SHOW_ICON)) + { + nid.dwState = NIS_HIDDEN; + nid.dwStateMask = NIS_HIDDEN; + nid.uFlags |= NIF_STATE; + } + if (pProps->Status == NCS_MEDIA_DISCONNECTED || pProps->Status == NCS_DISCONNECTED || pProps->Status == NCS_HARDWARE_DISABLED) + nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF)); + else if (pProps->Status == NCS_CONNECTED) + nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE)); - wcscpy(nid.szTip, pProps->pszwName); - nid.uFlags |= NIF_TIP; - } - pContext->hwndStatusDlg = hwndDlg; - pItem->hwndDlg = hwndDlg; + if (nid.hIcon) + nid.uFlags |= NIF_ICON; - if (Shell_NotifyIconW(NIM_ADD, &nid)) - { - if (pLast) - pLast->pNext = pItem; - else - m_pHead = pItem; + wcscpy(nid.szTip, pProps->pszwName); + nid.uFlags |= NIF_TIP; + } + pContext->hwndStatusDlg = hwndDlg; + pItem->hwndDlg = hwndDlg; - pLast = pItem; - Index++; - } - else - { - ERR("Shell_NotifyIconW failed\n"); - CoTaskMemFree(pItem); - } + if (Shell_NotifyIconW(NIM_ADD, &nid)) + { + if (pLast) + pLast->pNext = pItem; + else + m_pHead = pItem; - if (nid.uFlags & NIF_ICON) - DestroyIcon(nid.hIcon); - } else - ERR("CreateDialogParamW failed\n"); + pLast = pItem; + Index++; } - } while (hr == S_OK); + else + { + ERR("Shell_NotifyIconW failed\n"); + CoTaskMemFree(pItem); + } + + if (nid.uFlags & NIF_ICON) + DestroyIcon(nid.hIcon); + } m_lpNetMan = pNetConMan; - pEnumCon->Release(); return S_OK; } diff --git a/dll/shellext/netshell/lanstatusui.h b/dll/shellext/netshell/lanstatusui.h index 62f047b0cb..339db30d17 100644 --- a/dll/shellext/netshell/lanstatusui.h +++ b/dll/shellext/netshell/lanstatusui.h @@ -47,7 +47,7 @@ class CLanStatus: HRESULT InitializeNetTaskbarNotifications(); HRESULT ShowStatusDialogByCLSID(const GUID *pguidCmdGroup); - INetConnectionManager *m_lpNetMan; + CComPtr<INetConnectionManager> m_lpNetMan; NOTIFICATION_ITEM *m_pHead; public: diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index 82d0cfa02c..39c5c44ed8 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -57,18 +57,13 @@ CNetworkConnections::CNetworkConnections() : m_pidlRoot(_ILCreateNetConnect()) { HRESULT hr; - 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); + hr = CoCreateInstance(CLSID_ConnectionTray, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IOleCommandTarget, &m_lpOleCmd)); + if (FAILED_UNEXPECTEDLY(hr)) m_lpOleCmd = NULL; - } } CNetworkConnections::~CNetworkConnections() { - if (m_lpOleCmd) - m_lpOleCmd->Release(); SHFree(m_pidlRoot); } @@ -132,7 +127,6 @@ HRESULT WINAPI CNetworkConnections::CompareIDs( HRESULT WINAPI CNetworkConnections::CreateViewObject( HWND hwndOwner, REFIID riid, LPVOID * ppvOut) { - CSFV cvf; HRESULT hr = E_NOINTERFACE; if (!ppvOut) @@ -142,17 +136,13 @@ HRESULT WINAPI CNetworkConnections::CreateViewObject( if (IsEqualIID(riid, IID_IShellView)) { - ZeroMemory(&cvf, sizeof(cvf)); - cvf.cbSize = sizeof(cvf); - cvf.pshf = static_cast<IShellFolder*>(this); - - IShellView* pShellView; + CSFV cvf = {sizeof(cvf), this}; + CComPtr<IShellView> pShellView; hr = SHCreateShellFolderViewEx(&cvf, &pShellView); - if (SUCCEEDED(hr)) - { - hr = pShellView->QueryInterface(riid, ppvOut); - pShellView->Release(); - } + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return pShellView->QueryInterface(riid, ppvOut); } return hr; @@ -488,24 +478,18 @@ HRESULT WINAPI CNetworkConnections::MapColumnToSCID(UINT column, SHCOLUMNID *psc */ CNetConUiObject::CNetConUiObject() - : m_pidl(NULL), - m_pUnknown(NULL), - m_lpOleCmd(NULL) + : m_pidl(NULL) { } CNetConUiObject::~CNetConUiObject() { - if (m_lpOleCmd) - m_lpOleCmd->Release(); } HRESULT WINAPI CNetConUiObject::Initialize(PCUITEMID_CHILD pidl, IOleCommandTarget *lpOleCmd) { m_pidl = pidl; m_lpOleCmd = lpOleCmd; - if (m_lpOleCmd) - m_lpOleCmd->AddRef(); return S_OK; } @@ -657,7 +641,7 @@ ShowNetConnectionProperties( CLSID ClassID; PROPSHEETHEADERW pinfo; HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; - INetConnectionPropertyUi * pNCP; + CComPtr<INetConnectionPropertyUi> pNCP; NETCON_PROPERTIES * pProperties; if (pNetConnect->GetProperties(&pProperties) != S_OK) @@ -695,7 +679,6 @@ ShowNetConnectionProperties( hr = E_FAIL; } } - pNCP->Release(); NcFreeNetconProperties(pProperties); return hr; } @@ -737,14 +720,13 @@ HRESULT WINAPI CNetConUiObject::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) case IDS_NET_RENAME: { HRESULT hr; - IShellView *psv; - hr = IUnknown_QueryService(m_pUnknown, SID_IFolderView, IID_IShellView, (PVOID*)&psv); + CComPtr<IShellView> psv; + hr = IUnknown_QueryService(m_pUnknown, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); if (SUCCEEDED(hr)) { SVSIF selFlags = SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT; psv->SelectItem(m_pidl, selFlags); } - psv->Release(); return S_OK; } @@ -793,45 +775,18 @@ HRESULT WINAPI CNetConUiObject::HandleMenuMsg2( HRESULT WINAPI CNetConUiObject::GetSite(REFIID riid, PVOID *ppvSite) { - HRESULT hr; - IUnknown *pUnknown; - if (!m_pUnknown) { *ppvSite = NULL; return E_FAIL; } - hr = m_pUnknown->QueryInterface(riid, reinterpret_cast<PVOID*>(&pUnknown)); - if (SUCCEEDED(hr)) - { - pUnknown->AddRef(); - *ppvSite = pUnknown; - return S_OK; - } - - *ppvSite = NULL; - return hr; + return m_pUnknown->QueryInterface(riid, ppvSite); } HRESULT WINAPI CNetConUiObject::SetSite(IUnknown *pUnkSite) { - if (!pUnkSite) - { - if (m_pUnknown) - { - m_pUnknown->Release(); - m_pUnknown = NULL; - } - } - else - { - pUnkSite->AddRef(); - if (m_pUnknown) - m_pUnknown->Release(); - m_pUnknown = pUnkSite; - } - + m_pUnknown = pUnkSite; return S_OK; } diff --git a/dll/shellext/netshell/shfldr_netconnect.h b/dll/shellext/netshell/shfldr_netconnect.h index 2c541ad3bd..9326fdad14 100644 --- a/dll/shellext/netshell/shfldr_netconnect.h +++ b/dll/shellext/netshell/shfldr_netconnect.h @@ -64,7 +64,7 @@ class CNetworkConnections: /* both paths are parsible from the desktop */ PIDLIST_ABSOLUTE m_pidlRoot; - IOleCommandTarget *m_lpOleCmd; + CComPtr<IOleCommandTarget> m_lpOleCmd; public: @@ -94,8 +94,8 @@ class CNetConUiObject: { private: PCUITEMID_CHILD m_pidl; - IUnknown *m_pUnknown; - IOleCommandTarget *m_lpOleCmd; + CComPtr<IUnknown> m_pUnknown; + CComPtr<IOleCommandTarget> m_lpOleCmd; public: CNetConUiObject();

6 years, 1 month

02/09: [NETSHELL] Use ATL

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c73d8c64bbed43e93a2d7… commit c73d8c64bbed43e93a2d757f341ef5c3296456e8 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Nov 12 13:23:38 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 18 14:01:54 2018 +0200 [NETSHELL] Use ATL --- dll/shellext/netshell/CMakeLists.txt | 13 +- dll/shellext/netshell/classfactory.cpp | 105 --------- dll/shellext/netshell/connectmanager.cpp | 273 +++++------------------ dll/shellext/netshell/connectmanager.h | 75 +++++++ dll/shellext/netshell/enumlist.cpp | 124 ++++++++--- dll/shellext/netshell/enumlist.h | 52 ----- dll/shellext/netshell/lanconnectui.cpp | 163 +------------- dll/shellext/netshell/lanconnectui.h | 69 ++++++ dll/shellext/netshell/lanstatusui.cpp | 124 +---------- dll/shellext/netshell/lanstatusui.h | 62 ++++++ dll/shellext/netshell/netshell.cpp | 72 ++++-- dll/shellext/netshell/netshell.rc | 2 +- dll/shellext/netshell/precomp.h | 44 ++-- dll/shellext/netshell/shfldr_netconnect.cpp | 328 +--------------------------- dll/shellext/netshell/shfldr_netconnect.h | 137 ++++++++++++ 15 files changed, 596 insertions(+), 1047 deletions(-) diff --git a/dll/shellext/netshell/CMakeLists.txt b/dll/shellext/netshell/CMakeLists.txt index 3a5f4a5f1f..cff3ce29e4 100644 --- a/dll/shellext/netshell/CMakeLists.txt +++ b/dll/shellext/netshell/CMakeLists.txt @@ -11,6 +11,11 @@ endif() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions( + -D_ATL_NO_EXCEPTIONS) + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) + add_definitions(-D_NETSHELL_) spec2def(netshell.dll netshell.spec) @@ -18,7 +23,6 @@ list(APPEND SOURCE netshell.cpp shfldr_netconnect.cpp enumlist.cpp - classfactory.cpp connectmanager.cpp lanconnectui.cpp lanstatusui.cpp @@ -34,8 +38,9 @@ add_library(netshell SHARED ${CMAKE_CURRENT_BINARY_DIR}/netshell_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/netshell.def) -set_module_type(netshell win32dll) -target_link_libraries(netshell uuid wine) -add_importlibs(netshell shlwapi shell32 version iphlpapi ole32 gdi32 user32 advapi32 setupapi ws2_32 comctl32 msvcrt kernel32 ntdll) +set_module_type(netshell win32dll UNICODE) +target_link_libraries(netshell atlnew uuid wine) +add_delay_importlibs(netshell ole32 oleaut32 shlwapi shell32) +add_importlibs(netshell version iphlpapi gdi32 user32 advapi32 setupapi ws2_32 comctl32 msvcrt kernel32 ntdll) add_pch(netshell precomp.h SOURCE) add_cd_file(TARGET netshell DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/netshell/classfactory.cpp b/dll/shellext/netshell/classfactory.cpp deleted file mode 100644 index 1e4d5fed34..0000000000 --- a/dll/shellext/netshell/classfactory.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include "precomp.h" - -class CNetshellClassFactory final : - public IClassFactory -{ - public: - CNetshellClassFactory(REFCLSID rclsid); - - /* IUnknown */ - virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); - virtual ULONG WINAPI AddRef(); - virtual ULONG WINAPI Release(); - - /* IClassFactory */ - virtual HRESULT WINAPI CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject); - virtual HRESULT WINAPI LockServer(BOOL fLock); - - private: - LONG m_ref; - CLSID m_clsid; -}; - -CNetshellClassFactory::CNetshellClassFactory(REFCLSID rclsid) : - m_ref(0), - m_clsid(rclsid) -{ -} - -HRESULT -WINAPI -CNetshellClassFactory::QueryInterface( - REFIID riid, - LPVOID *ppvObj) -{ - *ppvObj = NULL; - if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IClassFactory)) - { - *ppvObj = static_cast<IClassFactory*>(this); - AddRef(); - return S_OK; - } - return E_NOINTERFACE; -} - -ULONG -WINAPI -CNetshellClassFactory::AddRef() -{ - ULONG refCount = InterlockedIncrement(&m_ref); - - return refCount; -} - -ULONG -WINAPI -CNetshellClassFactory::Release() -{ - ULONG refCount = InterlockedDecrement(&m_ref); - - if (!refCount) - delete this; - - return refCount; -} - -HRESULT -WINAPI -CNetshellClassFactory::CreateInstance( - LPUNKNOWN pUnkOuter, - REFIID riid, - LPVOID *ppvObject) -{ - *ppvObject = NULL; - - 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_LanConnectionUi)) - return LanConnectUI_Constructor(pUnkOuter, riid, ppvObject); - else if (IsEqualCLSID(m_clsid, CLSID_ConnectionTray)) - return LanConnectStatusUI_Constructor(pUnkOuter, riid, ppvObject); - - return E_NOINTERFACE; -} - -HRESULT -WINAPI -CNetshellClassFactory::LockServer(BOOL fLock) -{ - return E_NOTIMPL; -} - -HRESULT IClassFactory_fnConstructor(REFCLSID rclsid, REFIID riid, LPVOID *ppvOut) -{ - CNetshellClassFactory *pClsFactory = new CNetshellClassFactory(rclsid); - if (!pClsFactory) - return E_OUTOFMEMORY; - - pClsFactory->AddRef(); - HRESULT hr = pClsFactory->QueryInterface(riid, ppvOut); - pClsFactory->Release(); - - return hr; -} diff --git a/dll/shellext/netshell/connectmanager.cpp b/dll/shellext/netshell/connectmanager.cpp index f71d58f81a..88780be11d 100644 --- a/dll/shellext/netshell/connectmanager.cpp +++ b/dll/shellext/netshell/connectmanager.cpp @@ -7,146 +7,19 @@ #include "precomp.h" -typedef struct tagINetConnectionItem -{ - struct tagINetConnectionItem * Next; - DWORD dwAdapterIndex; - NETCON_PROPERTIES Props; -} INetConnectionItem, *PINetConnectionItem; - -class CNetConnectionManager final : - public INetConnectionManager, - public IEnumNetConnection -{ - public: - CNetConnectionManager(); - BOOL EnumerateINetConnections(); - - // IUnknown - virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); - virtual ULONG WINAPI AddRef(); - virtual ULONG WINAPI Release(); - - // INetConnectionManager - virtual HRESULT WINAPI EnumConnections(NETCONMGR_ENUM_FLAGS Flags, IEnumNetConnection **ppEnum); - - // IEnumNetConnection - virtual HRESULT WINAPI Next(ULONG celt, INetConnection **rgelt, ULONG *pceltFetched); - virtual HRESULT WINAPI Skip(ULONG celt); - virtual HRESULT WINAPI Reset(); - virtual HRESULT WINAPI Clone(IEnumNetConnection **ppenum); - - private: - LONG m_ref; - PINetConnectionItem m_pHead; - PINetConnectionItem m_pCurrent; -}; - -class CNetConnection final : - public INetConnection -{ - public: - CNetConnection(PINetConnectionItem pItem); - - // IUnknown - virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); - virtual ULONG WINAPI AddRef(); - virtual ULONG WINAPI Release(); - - // INetConnection - HRESULT WINAPI Connect(); - HRESULT WINAPI Disconnect(); - HRESULT WINAPI Delete(); - HRESULT WINAPI Duplicate(LPCWSTR pszwDuplicateName, INetConnection **ppCon); - HRESULT WINAPI GetProperties(NETCON_PROPERTIES **ppProps); - HRESULT WINAPI GetUiObjectClassId(CLSID *pclsid); - HRESULT WINAPI Rename(LPCWSTR pszwDuplicateName); - - private: - ~CNetConnection(); - - LONG m_ref; - NETCON_PROPERTIES m_Props; - DWORD m_dwAdapterIndex; -}; - VOID NormalizeOperStatus(MIB_IFROW *IfEntry, NETCON_PROPERTIES * Props); -CNetConnectionManager::CNetConnectionManager() : - m_ref(0), - m_pHead(NULL), - m_pCurrent(NULL) -{ -} - -HRESULT -WINAPI -CNetConnectionManager::QueryInterface( - REFIID iid, - LPVOID *ppvObj) -{ - *ppvObj = NULL; - - if (IsEqualIID(iid, IID_IUnknown) || - IsEqualIID(iid, IID_INetConnectionManager)) - { - *ppvObj = static_cast<INetConnectionManager*>(this); - AddRef(); - return S_OK; - } - - return E_NOINTERFACE; -} - -ULONG -WINAPI -CNetConnectionManager::AddRef() -{ - ULONG refCount = InterlockedIncrement(&m_ref); - - return refCount; -} - -ULONG -WINAPI -CNetConnectionManager::Release() -{ - ULONG refCount = InterlockedDecrement(&m_ref); - - if (!refCount) - delete this; - - return refCount; -} - -HRESULT -WINAPI -CNetConnectionManager::EnumConnections( - NETCONMGR_ENUM_FLAGS Flags, - IEnumNetConnection **ppEnum) -{ - TRACE("EnumConnections\n"); - - if (!ppEnum) - return E_POINTER; - - if (Flags != NCME_DEFAULT) - return E_FAIL; - - *ppEnum = static_cast<IEnumNetConnection*>(this); - AddRef(); - return S_OK; -} - /*************************************************************** * INetConnection Interface */ -CNetConnection::CNetConnection(PINetConnectionItem pItem) : - m_ref(0), - m_Props(pItem->Props), - m_dwAdapterIndex(pItem->dwAdapterIndex) +HRESULT +WINAPI +CNetConnection::Initialize(PINetConnectionItem pItem) { + m_Props = pItem->Props; + m_dwAdapterIndex = pItem->dwAdapterIndex; + if (pItem->Props.pszwName) { m_Props.pszwName = static_cast<PWSTR>(CoTaskMemAlloc((wcslen(pItem->Props.pszwName)+1)*sizeof(WCHAR))); @@ -160,6 +33,8 @@ CNetConnection::CNetConnection(PINetConnectionItem pItem) : if (m_Props.pszwDeviceName) wcscpy(m_Props.pszwDeviceName, pItem->Props.pszwDeviceName); } + + return S_OK; } CNetConnection::~CNetConnection() @@ -168,46 +43,6 @@ CNetConnection::~CNetConnection() CoTaskMemFree(m_Props.pszwDeviceName); } -HRESULT -WINAPI -CNetConnection::QueryInterface( - REFIID iid, - LPVOID * ppvObj) -{ - *ppvObj = NULL; - - if (IsEqualIID(iid, IID_IUnknown) || - IsEqualIID(iid, IID_INetConnection)) - { - *ppvObj = this; - AddRef(); - return S_OK; - } - - return E_NOINTERFACE; -} - -ULONG -WINAPI -CNetConnection::AddRef() -{ - ULONG refCount = InterlockedIncrement(&m_ref); - - return refCount; -} - -ULONG -WINAPI -CNetConnection::Release() -{ - ULONG refCount = InterlockedDecrement(&m_ref); - - if (!refCount) - delete this; - - return refCount; -} - HRESULT WINAPI CNetConnection::Connect() @@ -390,21 +225,37 @@ CNetConnection::Rename(LPCWSTR pszwDuplicateName) return hr; } -HRESULT WINAPI IConnection_Constructor(INetConnection **ppv, PINetConnectionItem pItem) +HRESULT WINAPI CNetConnection_CreateInstance(PINetConnectionItem pItem, REFIID riid, LPVOID * ppv) { - if (!ppv) - return E_POINTER; + return ShellObjectCreatorInit<CNetConnection>(pItem, riid, ppv); +} - CNetConnection *pConnection = new CNetConnection(pItem); - if (!pConnection) - return E_OUTOFMEMORY; - pConnection->AddRef(); - *ppv = pConnection; - return S_OK; +CNetConnectionManager::CNetConnectionManager() : + m_pHead(NULL), + m_pCurrent(NULL) +{ } +HRESULT +WINAPI +CNetConnectionManager::EnumConnections( + NETCONMGR_ENUM_FLAGS Flags, + IEnumNetConnection **ppEnum) +{ + TRACE("EnumConnections\n"); + + if (!ppEnum) + return E_POINTER; + + if (Flags != NCME_DEFAULT) + return E_FAIL; + + *ppEnum = static_cast<IEnumNetConnection*>(this); + AddRef(); + return S_OK; +} /*************************************************************** * IEnumNetConnection Interface @@ -428,7 +279,7 @@ CNetConnectionManager::Next( if (!m_pCurrent) return S_FALSE; - hr = IConnection_Constructor(rgelt, m_pCurrent); + hr = CNetConnection_CreateInstance(m_pCurrent, IID_PPV_ARG(INetConnection, rgelt)); m_pCurrent = m_pCurrent->Next; return hr; @@ -517,7 +368,7 @@ NormalizeOperStatus( } } -BOOL +HRESULT CNetConnectionManager::EnumerateINetConnections() { DWORD dwSize, dwResult, dwIndex, dwAdapterIndex, dwShowIcon, dwNotifyDisconnect; @@ -536,17 +387,17 @@ CNetConnectionManager::EnumerateINetConnections() /* get the IfTable */ dwSize = 0; if (GetIfTable(NULL, &dwSize, TRUE) != ERROR_INSUFFICIENT_BUFFER) - return FALSE; + return E_FAIL; pIfTable = static_cast<PMIB_IFTABLE>(CoTaskMemAlloc(dwSize)); if (!pIfTable) - return FALSE; + return E_OUTOFMEMORY; dwResult = GetIfTable(pIfTable, &dwSize, TRUE); if (dwResult != NO_ERROR) { CoTaskMemFree(pIfTable); - return FALSE; + return HRESULT_FROM_WIN32(dwResult); } dwSize = 0; @@ -554,21 +405,22 @@ CNetConnectionManager::EnumerateINetConnections() if (dwResult!= ERROR_BUFFER_OVERFLOW) { CoTaskMemFree(pIfTable); - return FALSE; + return HRESULT_FROM_WIN32(dwResult); } pAdapterInfo = static_cast<PIP_ADAPTER_INFO>(CoTaskMemAlloc(dwSize)); if (!pAdapterInfo) { CoTaskMemFree(pIfTable); - return FALSE; + return E_OUTOFMEMORY; } - if (GetAdaptersInfo(pAdapterInfo, &dwSize) != NO_ERROR) + dwResult = GetAdaptersInfo(pAdapterInfo, &dwSize); + if (dwResult != NO_ERROR) { CoTaskMemFree(pIfTable); CoTaskMemFree(pAdapterInfo); - return FALSE; + return HRESULT_FROM_WIN32(dwResult); } hInfo = SetupDiGetClassDevs(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT ); @@ -576,7 +428,7 @@ CNetConnectionManager::EnumerateINetConnections() { CoTaskMemFree(pIfTable); CoTaskMemFree(pAdapterInfo); - return FALSE; + return E_FAIL; } dwIndex = 0; @@ -690,31 +542,22 @@ CNetConnectionManager::EnumerateINetConnections() SetupDiDestroyDeviceInfoList(hInfo); m_pCurrent = m_pHead; - return TRUE; + return (m_pHead != NULL ? S_OK : S_FALSE); } -HRESULT WINAPI INetConnectionManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID * ppv) +HRESULT CNetConnectionManager::Initialize() { - TRACE("INetConnectionManager_Constructor\n"); - - if (!ppv) - return E_POINTER; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - CNetConnectionManager *pConnectionMgr = new CNetConnectionManager; - if (!pConnectionMgr) - return E_OUTOFMEMORY; - - pConnectionMgr->AddRef(); - HRESULT hr = pConnectionMgr->QueryInterface(riid, ppv); - - if (SUCCEEDED(hr)) - pConnectionMgr->EnumerateINetConnections(); - - pConnectionMgr->Release(); - - return hr; + HRESULT hr = EnumerateINetConnections(); + if (FAILED_UNEXPECTEDLY(hr)) + { + /* If something went wrong during the enumeration print an error don't enumerate anything */ + m_pCurrent = m_pHead = NULL; + return S_FALSE; + } + return S_OK; } - +HRESULT WINAPI CNetConnectionManager_CreateInstance(REFIID riid, LPVOID * ppv) +{ + return ShellObjectCreatorInit<CNetConnectionManager>(riid, ppv); +} diff --git a/dll/shellext/netshell/connectmanager.h b/dll/shellext/netshell/connectmanager.h new file mode 100644 index 0000000000..a4a83296b4 --- /dev/null +++ b/dll/shellext/netshell/connectmanager.h @@ -0,0 +1,75 @@ + +typedef struct tagINetConnectionItem +{ + struct tagINetConnectionItem * Next; + DWORD dwAdapterIndex; + NETCON_PROPERTIES Props; +} INetConnectionItem, *PINetConnectionItem; + +class CNetConnectionManager: + public CComCoClass<CNetConnectionManager, &CLSID_ConnectionManager>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public INetConnectionManager, + public IEnumNetConnection +{ + public: + CNetConnectionManager(); + HRESULT Initialize(); + HRESULT EnumerateINetConnections(); + + // INetConnectionManager + virtual HRESULT WINAPI EnumConnections(NETCONMGR_ENUM_FLAGS Flags, IEnumNetConnection **ppEnum); + + // IEnumNetConnection + virtual HRESULT WINAPI Next(ULONG celt, INetConnection **rgelt, ULONG *pceltFetched); + virtual HRESULT WINAPI Skip(ULONG celt); + virtual HRESULT WINAPI Reset(); + virtual HRESULT WINAPI Clone(IEnumNetConnection **ppenum); + + private: + PINetConnectionItem m_pHead; + PINetConnectionItem m_pCurrent; + + public: + DECLARE_NO_REGISTRY() + DECLARE_NOT_AGGREGATABLE(CNetConnectionManager) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CNetConnectionManager) + COM_INTERFACE_ENTRY_IID(IID_INetConnectionManager, INetConnectionManager) + COM_INTERFACE_ENTRY_IID(IID_IEnumNetConnection, IEnumNetConnection) + END_COM_MAP() +}; + +class CNetConnection: + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public INetConnection +{ + private: + NETCON_PROPERTIES m_Props; + DWORD m_dwAdapterIndex; + + public: + ~CNetConnection(); + HRESULT WINAPI Initialize(PINetConnectionItem pItem); + + // INetConnection + HRESULT WINAPI Connect(); + HRESULT WINAPI Disconnect(); + HRESULT WINAPI Delete(); + HRESULT WINAPI Duplicate(LPCWSTR pszwDuplicateName, INetConnection **ppCon); + HRESULT WINAPI GetProperties(NETCON_PROPERTIES **ppProps); + HRESULT WINAPI GetUiObjectClassId(CLSID *pclsid); + HRESULT WINAPI Rename(LPCWSTR pszwDuplicateName); + + DECLARE_NOT_AGGREGATABLE(CNetConnection) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CNetConnection) + COM_INTERFACE_ENTRY_IID(IID_INetConnection, INetConnection) + END_COM_MAP() +}; + +BOOL GetAdapterIndexFromNetCfgInstanceId(PIP_ADAPTER_INFO pAdapterInfo, LPWSTR szNetCfg, PDWORD pIndex); +HRESULT WINAPI CNetConnectionManager_CreateInstance(REFIID riid, LPVOID * ppv); + diff --git a/dll/shellext/netshell/enumlist.cpp b/dll/shellext/netshell/enumlist.cpp index 9dc629cccc..c4e5de37a7 100644 --- a/dll/shellext/netshell/enumlist.cpp +++ b/dll/shellext/netshell/enumlist.cpp @@ -7,6 +7,63 @@ #include "precomp.h" + +typedef struct tagGUIDStruct +{ + BYTE dummy; /* offset 01 is unknown */ + GUID guid; /* offset 02 */ +} GUIDStruct; + +#define PT_GUID 0x1F + +typedef struct tagPIDLDATA +{ + BYTE type; /*00*/ + union + { + struct tagGUIDStruct guid; + struct tagVALUEStruct value; + } u; +} PIDLDATA, *LPPIDLDATA; + +typedef struct tagENUMLIST +{ + struct tagENUMLIST *pNext; + PITEMID_CHILD pidl; +} ENUMLIST, *LPENUMLIST; + +class CEnumIDList: + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IEnumIDList +{ + public: + CEnumIDList(); + ~CEnumIDList(); + + HRESULT Initialize(); + + // IEnumIDList + virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, PITEMID_CHILD *rgelt, ULONG *pceltFetched); + virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt); + virtual HRESULT STDMETHODCALLTYPE Reset(); + virtual HRESULT STDMETHODCALLTYPE Clone(IEnumIDList **ppenum); + + private: + BOOL AddToEnumList(PITEMID_CHILD pidl); + + LPENUMLIST m_pFirst; + LPENUMLIST m_pLast; + LPENUMLIST m_pCurrent; + + public: + DECLARE_NOT_AGGREGATABLE(CEnumIDList) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CEnumIDList) + COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) + END_COM_MAP() +}; + /************************************************************************** * AddToEnumList() */ @@ -44,7 +101,6 @@ CEnumIDList::AddToEnumList(PITEMID_CHILD pidl) } CEnumIDList::CEnumIDList() : - m_ref(0), m_pFirst(NULL), m_pLast(NULL), m_pCurrent(NULL) @@ -65,41 +121,48 @@ CEnumIDList::~CEnumIDList() } HRESULT -WINAPI -CEnumIDList::QueryInterface( - REFIID riid, - LPVOID *ppvObj) +CEnumIDList::Initialize() { - *ppvObj = NULL; + HRESULT hr; + INetConnectionManager *pNetConMan; + IEnumNetConnection *pEnumCon; + INetConnection *INetCon; + ULONG Count; + PITEMID_CHILD pidl; - if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IEnumIDList)) + /* get an instance to of IConnectionManager */ + hr = CNetConnectionManager_CreateInstance(IID_INetConnectionManager, (LPVOID*)&pNetConMan); + if (FAILED(hr)) + return S_OK; + + hr = pNetConMan->EnumConnections(NCME_DEFAULT, &pEnumCon); + if (FAILED(hr)) { - *ppvObj = static_cast<IEnumIDList*>(this); - AddRef(); + pNetConMan->Release(); return S_OK; } - return E_NOINTERFACE; -} - -ULONG -WINAPI -CEnumIDList::AddRef() -{ - ULONG refCount = InterlockedIncrement(&m_ref); - - return refCount; -} - -ULONG -WINAPI CEnumIDList::Release() -{ - ULONG refCount = InterlockedDecrement(&m_ref); + do + { + hr = pEnumCon->Next(1, &INetCon, &Count); + if (hr == S_OK) + { + pidl = ILCreateNetConnectItem(INetCon); + if (pidl) + { + AddToEnumList(pidl); + } + } + else + { + break; + } + } while (TRUE); - if (!refCount) - delete this; + pEnumCon->Release(); + pNetConMan->Release(); - return refCount; + return S_OK; } HRESULT @@ -264,3 +327,8 @@ const VALUEStruct * _ILGetValueStruct(LPCITEMIDLIST pidl) return NULL; } + +HRESULT CEnumIDList_CreateInstance(HWND hwndOwner, DWORD dwFlags, REFIID riid, LPVOID * ppv) +{ + return ShellObjectCreatorInit<CEnumIDList>(riid, ppv); +} diff --git a/dll/shellext/netshell/enumlist.h b/dll/shellext/netshell/enumlist.h deleted file mode 100644 index a693e1e674..0000000000 --- a/dll/shellext/netshell/enumlist.h +++ /dev/null @@ -1,52 +0,0 @@ -#pragma once - -typedef struct tagGUIDStruct -{ - BYTE dummy; /* offset 01 is unknown */ - GUID guid; /* offset 02 */ -} GUIDStruct; - -#define PT_GUID 0x1F - -typedef struct tagPIDLDATA -{ - BYTE type; /*00*/ - union - { - struct tagGUIDStruct guid; - struct tagVALUEStruct value; - } u; -} PIDLDATA, *LPPIDLDATA; - -typedef struct tagENUMLIST -{ - struct tagENUMLIST *pNext; - PITEMID_CHILD pidl; -} ENUMLIST, *LPENUMLIST; - -class CEnumIDList final : - public IEnumIDList -{ - public: - CEnumIDList(); - BOOL AddToEnumList(PITEMID_CHILD pidl); - - // IUnknown - virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); - virtual ULONG WINAPI AddRef(); - virtual ULONG WINAPI Release(); - - // IEnumIDList - virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, PITEMID_CHILD *rgelt, ULONG *pceltFetched); - virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt); - virtual HRESULT STDMETHODCALLTYPE Reset(); - virtual HRESULT STDMETHODCALLTYPE Clone(IEnumIDList **ppenum); - - private: - ~CEnumIDList(); - - LONG m_ref; - LPENUMLIST m_pFirst; - LPENUMLIST m_pLast; - LPENUMLIST m_pCurrent; -}; diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index 4722b914f5..60e25f0363 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -7,78 +7,11 @@ #include "precomp.h" -#include <netcfgx.h> -#include <netcfgn.h> -#include <strsafe.h> - -/// CLASSID -/// {7007ACC5-3202-11D1-AAD2-00805FC1270E} -/// open network properties and wlan properties - -typedef enum -{ - NET_TYPE_CLIENT = 1, - NET_TYPE_SERVICE = 2, - NET_TYPE_PROTOCOL = 3 -} NET_TYPE; - -typedef struct -{ - NET_TYPE Type; - DWORD dwCharacteristics; - LPWSTR szHelp; - INetCfgComponent *pNCfgComp; - UINT NumPropDialogOpen; -} NET_ITEM, *PNET_ITEM; - -class CNetConnectionPropertyUi final : - public INetConnectionConnectUi, - public INetConnectionPropertyUi2, - public INetLanConnectionUiInfo -{ - public: - CNetConnectionPropertyUi(); - - // IUnknown - virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); - virtual ULONG WINAPI AddRef(); - virtual ULONG WINAPI Release(); - - // INetConnectionPropertyUi2 - virtual HRESULT WINAPI AddPages(HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); - virtual HRESULT WINAPI GetIcon(DWORD dwSize, HICON *phIcon); - - // INetLanConnectionUiInfo - virtual HRESULT WINAPI GetDeviceGuid(GUID *pGuid); - - // INetConnectionConnectUi - virtual HRESULT WINAPI SetConnection(INetConnection* pCon); - virtual HRESULT WINAPI Connect(HWND hwndParent, DWORD dwFlags); - virtual HRESULT WINAPI Disconnect(HWND hwndParent, DWORD dwFlags); - - private: - ~CNetConnectionPropertyUi(); - - BOOL GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent ** pOut); - VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type); - VOID InitializeLANPropertiesUIDlg(HWND hwndDlg); - VOID ShowNetworkComponentProperties(HWND hwndDlg); - BOOL GetDeviceInstanceID(OUT LPOLESTR *DeviceInstanceID); - static INT_PTR CALLBACK LANPropertiesUIDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - - INetConnection * m_pCon; - INetCfgLock *m_NCfgLock; - INetCfg * m_pNCfg; - NETCON_PROPERTIES * m_pProperties; - LONG m_ref; -}; - CNetConnectionPropertyUi::CNetConnectionPropertyUi() : m_pCon(NULL), m_NCfgLock(NULL), m_pNCfg(NULL), - m_pProperties(NULL), - m_ref(0) + m_pProperties(NULL) { } @@ -99,26 +32,6 @@ CNetConnectionPropertyUi::~CNetConnectionPropertyUi() } } -HPROPSHEETPAGE -InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) -{ - PROPSHEETPAGEW ppage; - - memset(&ppage, 0x0, sizeof(PROPSHEETPAGEW)); - ppage.dwSize = sizeof(PROPSHEETPAGEW); - ppage.dwFlags = PSP_DEFAULT; - ppage.pszTemplate = resname; - ppage.pfnDlgProc = dlgproc; - ppage.lParam = lParam; - ppage.hInstance = netshell_hInstance; - if (szTitle) - { - ppage.dwFlags |= PSP_USETITLE; - ppage.pszTitle = szTitle; - } - return CreatePropertySheetPageW(&ppage); -} - VOID AddItemToListView(HWND hDlgCtrl, PNET_ITEM pItem, LPWSTR szName, BOOL bChecked) { @@ -528,59 +441,6 @@ CNetConnectionPropertyUi::GetDeviceInstanceID( return FALSE; } -HRESULT -WINAPI -CNetConnectionPropertyUi::QueryInterface( - REFIID iid, - LPVOID *ppvObj) -{ - *ppvObj = NULL; - - if (IsEqualIID (iid, IID_IUnknown) || - IsEqualIID (iid, IID_INetConnectionPropertyUi) || - IsEqualIID (iid, IID_INetConnectionPropertyUi2)) - { - *ppvObj = (INetConnectionPropertyUi2*)this; - AddRef(); - return S_OK; - } - else if (IsEqualIID(iid, IID_INetLanConnectionUiInfo)) - { - *ppvObj = (INetLanConnectionUiInfo*)this; - AddRef(); - return S_OK; - } - else if (IsEqualIID(iid, IID_INetConnectionConnectUi)) - { - *ppvObj = (INetConnectionConnectUi*)this; - AddRef(); - return S_OK; - } - - return E_NOINTERFACE; -} - -ULONG -WINAPI -CNetConnectionPropertyUi::AddRef() -{ - ULONG refCount = InterlockedIncrement(&m_ref); - - return refCount; -} - -ULONG -WINAPI -CNetConnectionPropertyUi::Release() -{ - ULONG refCount = InterlockedDecrement(&m_ref); - - if (!refCount) - delete this; - - return refCount; -} - HRESULT WINAPI CNetConnectionPropertyUi::AddPages( @@ -679,24 +539,3 @@ CNetConnectionPropertyUi::Disconnect( return S_OK; } - -HRESULT WINAPI LanConnectUI_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) -{ - TRACE("LanConnectUI_Constructor\n"); - - if (!ppv) - return E_POINTER; - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - CNetConnectionPropertyUi *pConPropUi = new CNetConnectionPropertyUi; - if (!pConPropUi) - return E_OUTOFMEMORY; - - pConPropUi->AddRef(); - HRESULT hr = pConPropUi->QueryInterface(riid, ppv); - pConPropUi->Release(); - - return hr; -} diff --git a/dll/shellext/netshell/lanconnectui.h b/dll/shellext/netshell/lanconnectui.h new file mode 100644 index 0000000000..02c8a8051b --- /dev/null +++ b/dll/shellext/netshell/lanconnectui.h @@ -0,0 +1,69 @@ + +/// CLASSID +/// {7007ACC5-3202-11D1-AAD2-00805FC1270E} +/// open network properties and wlan properties + +typedef enum +{ + NET_TYPE_CLIENT = 1, + NET_TYPE_SERVICE = 2, + NET_TYPE_PROTOCOL = 3 +} NET_TYPE; + +typedef struct +{ + NET_TYPE Type; + DWORD dwCharacteristics; + LPWSTR szHelp; + INetCfgComponent *pNCfgComp; + UINT NumPropDialogOpen; +} NET_ITEM, *PNET_ITEM; + +class CNetConnectionPropertyUi: + public CComCoClass<CNetConnectionPropertyUi, &CLSID_LanConnectionUi>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public INetConnectionConnectUi, + public INetConnectionPropertyUi2, + public INetLanConnectionUiInfo +{ + public: + CNetConnectionPropertyUi(); + ~CNetConnectionPropertyUi(); + + // INetConnectionPropertyUi2 + virtual HRESULT WINAPI AddPages(HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); + virtual HRESULT WINAPI GetIcon(DWORD dwSize, HICON *phIcon); + + // INetLanConnectionUiInfo + virtual HRESULT WINAPI GetDeviceGuid(GUID *pGuid); + + // INetConnectionConnectUi + virtual HRESULT WINAPI SetConnection(INetConnection* pCon); + virtual HRESULT WINAPI Connect(HWND hwndParent, DWORD dwFlags); + virtual HRESULT WINAPI Disconnect(HWND hwndParent, DWORD dwFlags); + + private: + BOOL GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent ** pOut); + VOID EnumComponents(HWND hDlgCtrl, INetCfg *pNCfg, const GUID *CompGuid, UINT Type); + VOID InitializeLANPropertiesUIDlg(HWND hwndDlg); + VOID ShowNetworkComponentProperties(HWND hwndDlg); + BOOL GetDeviceInstanceID(OUT LPOLESTR *DeviceInstanceID); + static INT_PTR CALLBACK LANPropertiesUIDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + + INetConnection * m_pCon; + INetCfgLock *m_NCfgLock; + INetCfg * m_pNCfg; + NETCON_PROPERTIES * m_pProperties; + + public: + DECLARE_NO_REGISTRY() + DECLARE_NOT_AGGREGATABLE(CNetConnectionPropertyUi) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CNetConnectionPropertyUi) + COM_INTERFACE_ENTRY_IID(IID_INetConnectionConnectUi, INetConnectionConnectUi) + COM_INTERFACE_ENTRY_IID(IID_INetConnectionPropertyUi, INetConnectionPropertyUi2) + COM_INTERFACE_ENTRY_IID(IID_INetConnectionPropertyUi2, INetConnectionPropertyUi2) + COM_INTERFACE_ENTRY_IID(IID_INetLanConnectionUiInfo, INetLanConnectionUiInfo) + END_COM_MAP() +}; diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 19e3beca92..2aa7cc0237 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -9,65 +9,8 @@ #include <winsock.h> -/// CLSID -/// HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{7007ACCF-3202-11D1-AAD2-00805FC1270E} -// IID B722BCCB-4E68-101B-A2BC-00AA00404770 - -#define WM_SHOWSTATUSDLG (WM_USER+10) - -typedef struct tagNotificationItem -{ - struct tagNotificationItem *pNext; - CLSID guidItem; - UINT uID; - HWND hwndDlg; - INetConnection *pNet; -} NOTIFICATION_ITEM; - -typedef struct -{ - INetConnection *pNet; - HWND hwndStatusDlg; /* LanStatusDlg window */ - HWND hwndDlg; /* status dialog window */ - DWORD dwAdapterIndex; - UINT_PTR nIDEvent; - UINT DHCPEnabled; - DWORD dwInOctets; - DWORD dwOutOctets; - DWORD IpAddress; - DWORD SubnetMask; - DWORD Gateway; - UINT uID; - UINT Status; -} LANSTATUSUI_CONTEXT; - -class CLanStatus final : - public IOleCommandTarget -{ - public: - CLanStatus(); - - // IUnknown - virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); - virtual ULONG WINAPI AddRef(); - virtual ULONG WINAPI Release(); - - // IOleCommandTarget - virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText); - virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - - private: - HRESULT InitializeNetTaskbarNotifications(); - HRESULT ShowStatusDialogByCLSID(const GUID *pguidCmdGroup); - - INetConnectionManager *m_lpNetMan; - LONG m_ref; - NOTIFICATION_ITEM *m_pHead; -}; - CLanStatus::CLanStatus() : m_lpNetMan(NULL), - m_ref(0), m_pHead(NULL) { } @@ -1002,10 +945,10 @@ CLanStatus::InitializeNetTaskbarNotifications() //hr = CoCreateInstance(&CLSID_ConnectionManager, NULL, CLSCTX_INPROC_SERVER, &IID_INetConnectionManager, (LPVOID*)&pNetConMan); - hr = INetConnectionManager_Constructor(NULL, IID_INetConnectionManager, (LPVOID*)&pNetConMan); + hr = CNetConnectionManager_CreateInstance(IID_INetConnectionManager, (LPVOID*)&pNetConMan); if (FAILED(hr)) { - ERR("INetConnectionManager_Constructor failed\n"); + ERR("CNetConnectionManager_CreateInstance failed\n"); return hr; } @@ -1124,46 +1067,6 @@ CLanStatus::ShowStatusDialogByCLSID(const GUID *pguidCmdGroup) return E_FAIL; } -HRESULT -WINAPI -CLanStatus::QueryInterface( - REFIID iid, - LPVOID *ppvObj) -{ - *ppvObj = NULL; - - if (IsEqualIID(iid, IID_IUnknown) || - IsEqualIID(iid, IID_IOleCommandTarget)) - { - *ppvObj = this; - AddRef(); - return S_OK; - } - - return E_NOINTERFACE; -} - -ULONG -WINAPI -CLanStatus::AddRef() -{ - ULONG refCount = InterlockedIncrement(&m_ref); - - return refCount; -} - -ULONG -WINAPI -CLanStatus::Release() -{ - ULONG refCount = InterlockedDecrement(&m_ref); - - if (!refCount) - delete this; - - return refCount; -} - HRESULT WINAPI CLanStatus::QueryStatus( @@ -1199,26 +1102,3 @@ CLanStatus::Exec( } return S_OK; } - -HRESULT WINAPI LanConnectStatusUI_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) -{ - TRACE("LanConnectStatusUI_Constructor\n"); - - if (!ppv) - return E_POINTER; - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - CLanStatus *pLanStatus = new CLanStatus; - if (!pLanStatus) - return E_OUTOFMEMORY; - - pLanStatus->AddRef(); - static volatile CLanStatus *pCachedLanStatus = NULL; - if (InterlockedCompareExchangePointer((void **)&pCachedLanStatus, pLanStatus, NULL) != NULL) - pLanStatus->Release(); - - return ((CLanStatus*)pCachedLanStatus)->QueryInterface(riid, ppv); -} - diff --git a/dll/shellext/netshell/lanstatusui.h b/dll/shellext/netshell/lanstatusui.h new file mode 100644 index 0000000000..62f047b0cb --- /dev/null +++ b/dll/shellext/netshell/lanstatusui.h @@ -0,0 +1,62 @@ + +/// CLSID +/// HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{7007ACCF-3202-11D1-AAD2-00805FC1270E} +// IID B722BCCB-4E68-101B-A2BC-00AA00404770 + +#define WM_SHOWSTATUSDLG (WM_USER+10) + +typedef struct tagNotificationItem +{ + struct tagNotificationItem *pNext; + CLSID guidItem; + UINT uID; + HWND hwndDlg; + INetConnection *pNet; +} NOTIFICATION_ITEM; + +typedef struct +{ + INetConnection *pNet; + HWND hwndStatusDlg; /* LanStatusDlg window */ + HWND hwndDlg; /* status dialog window */ + DWORD dwAdapterIndex; + UINT_PTR nIDEvent; + UINT DHCPEnabled; + DWORD dwInOctets; + DWORD dwOutOctets; + DWORD IpAddress; + DWORD SubnetMask; + DWORD Gateway; + UINT uID; + UINT Status; +} LANSTATUSUI_CONTEXT; + +class CLanStatus: + public CComCoClass<CLanStatus, &CLSID_ConnectionTray>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IOleCommandTarget +{ + public: + CLanStatus(); + + // IOleCommandTarget + virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText); + virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + private: + HRESULT InitializeNetTaskbarNotifications(); + HRESULT ShowStatusDialogByCLSID(const GUID *pguidCmdGroup); + + INetConnectionManager *m_lpNetMan; + NOTIFICATION_ITEM *m_pHead; + + public: + DECLARE_NO_REGISTRY() + DECLARE_CENTRAL_INSTANCE_NOT_AGGREGATABLE(CLanStatus) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CLanStatus) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + END_COM_MAP() + +}; diff --git a/dll/shellext/netshell/netshell.cpp b/dll/shellext/netshell/netshell.cpp index 0aaab32f6e..17ef8e747b 100644 --- a/dll/shellext/netshell/netshell.cpp +++ b/dll/shellext/netshell/netshell.cpp @@ -7,16 +7,46 @@ #include "precomp.h" -#include <olectl.h> +HMODULE g_hModule = NULL; HINSTANCE netshell_hInstance; -extern "C" +class CNetshellModule : public CComModule { +public: +}; + +BEGIN_OBJECT_MAP(ObjectMap) + OBJECT_ENTRY(CLSID_ConnectionFolder, CNetworkConnections) + OBJECT_ENTRY(CLSID_ConnectionManager, CNetConnectionManager) + OBJECT_ENTRY(CLSID_LanConnectionUi, CNetConnectionPropertyUi) + OBJECT_ENTRY(CLSID_ConnectionTray, CLanStatus) +END_OBJECT_MAP() + +CNetshellModule gModule; -/* FIXME: rpcproxy.h */ -HRESULT __wine_register_resources(HMODULE module); -HRESULT __wine_unregister_resources(HMODULE module); +HPROPSHEETPAGE +InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) +{ + PROPSHEETPAGEW ppage; + + memset(&ppage, 0x0, sizeof(PROPSHEETPAGEW)); + ppage.dwSize = sizeof(PROPSHEETPAGEW); + ppage.dwFlags = PSP_DEFAULT; + ppage.pszTemplate = resname; + ppage.pfnDlgProc = dlgproc; + ppage.lParam = lParam; + ppage.hInstance = netshell_hInstance; + if (szTitle) + { + ppage.dwFlags |= PSP_USETITLE; + ppage.pszTitle = szTitle; + } + return CreatePropertySheetPageW(&ppage); +} + +extern "C" +{ BOOL WINAPI @@ -27,6 +57,7 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: netshell_hInstance = hinstDLL; DisableThreadLibraryCalls(netshell_hInstance); + gModule.Init(ObjectMap, netshell_hInstance, NULL); break; default: break; @@ -45,13 +76,33 @@ DllCanUnloadNow(void) STDAPI DllRegisterServer(void) { - return __wine_register_resources(netshell_hInstance); + HRESULT hr; + + hr = gModule.DllRegisterServer(FALSE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = gModule.UpdateRegistryFromResource(IDR_NETSHELL, TRUE, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; } STDAPI DllUnregisterServer(void) { - return __wine_unregister_resources(netshell_hInstance); + HRESULT hr; + + hr = gModule.DllUnregisterServer(FALSE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = gModule.UpdateRegistryFromResource(IDR_NETSHELL, FALSE, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; } STDAPI @@ -60,12 +111,7 @@ DllGetClassObject( REFIID riid, LPVOID *ppv) { - if (!ppv) - return E_INVALIDARG; - - *ppv = NULL; - - return IClassFactory_fnConstructor(rclsid, riid, ppv); + return gModule.DllGetClassObject(rclsid, riid, ppv); } VOID diff --git a/dll/shellext/netshell/netshell.rc b/dll/shellext/netshell/netshell.rc index 363273cd4e..b0c9625c7e 100644 --- a/dll/shellext/netshell/netshell.rc +++ b/dll/shellext/netshell/netshell.rc @@ -23,7 +23,7 @@ IDI_NET_TRANS ICON "res/nettrans.ico" IDI_NET_TRANSREC ICON "res/nettrrec.ico" IDI_NET_SETUP ICON "res/netsetup.ico" -IDR_NETSHELL WINE_REGISTRY "res/netshell.rgs" +IDR_NETSHELL REGISTRY "res/netshell.rgs" #include <reactos/manifest_dll.rc> diff --git a/dll/shellext/netshell/precomp.h b/dll/shellext/netshell/precomp.h index 0d763a15da..a9553dc992 100644 --- a/dll/shellext/netshell/precomp.h +++ b/dll/shellext/netshell/precomp.h @@ -16,22 +16,28 @@ #include <shlwapi.h> #include <shlobj.h> #include <shellapi.h> +#include <atlbase.h> +#include <atlcom.h> +#include <atlcoll.h> +#include <atlstr.h> #include <iphlpapi.h> #include <setupapi.h> #include <devguid.h> #include <netcon.h> #include <shlguid_undoc.h> #include <prsht.h> +#include <undocshell.h> +#include <shellutils.h> + +#include <netcfgx.h> +#include <netcfgn.h> +#include <strsafe.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); #include "resource.h" -#if defined(_MSC_VER) && _MSC_VER < 1700 -#define final sealed -#endif - #define NCF_VIRTUAL 0x1 #define NCF_SOFTWARE_ENUMERATED 0x2 #define NCF_PHYSICAL 0x4 @@ -43,13 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #define NCF_FILTER 0x400 #define NCF_NDIS_PROTOCOL 0x4000 -typedef struct { - int colnameid; - int pcsFlags; - int fmt; - int cxChar; -} shvheader; - typedef struct tagVALUEStruct { BYTE dummy; @@ -59,32 +58,21 @@ typedef struct tagVALUEStruct /* globals */ extern HINSTANCE netshell_hInstance; -/* shfldr_netconnect.c */ -HRESULT ShowNetConnectionProperties(INetConnection * pNetConnect, HWND hwnd); -HRESULT WINAPI ISF_NetConnect_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); - /* enumlist.c */ PITEMID_CHILD _ILCreateNetConnect(void); PITEMID_CHILD ILCreateNetConnectItem(INetConnection *pItem); BOOL _ILIsNetConnect(LPCITEMIDLIST pidl); const VALUEStruct * _ILGetValueStruct(LPCITEMIDLIST pidl); +HRESULT CEnumIDList_CreateInstance(HWND hwndOwner, DWORD dwFlags, REFIID riid, LPVOID * ppv); -/* classfactory.c */ -HRESULT IClassFactory_fnConstructor(REFCLSID rclsid, REFIID riid, LPVOID *ppvOut); - -/* connectmanager.c */ -HRESULT WINAPI INetConnectionManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); -BOOL GetAdapterIndexFromNetCfgInstanceId(PIP_ADAPTER_INFO pAdapterInfo, LPWSTR szNetCfg, PDWORD pIndex); +#define NCCF_NOTIFY_DISCONNECTED 0x100000 -/* lanconnectui.c */ HPROPSHEETPAGE InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle); -HRESULT WINAPI LanConnectUI_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); -/* lanstatusui.c */ -HRESULT WINAPI LanConnectStatusUI_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); - -#define NCCF_NOTIFY_DISCONNECTED 0x100000 +#include "connectmanager.h" +#include "lanconnectui.h" +#include "lanstatusui.h" +#include "shfldr_netconnect.h" -#include "enumlist.h" #endif /* _PRECOMP_H__ */ diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index 91e12020d6..82d0cfa02c 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -33,112 +33,6 @@ * IShellFolder implementation */ -class CNetworkConnections final : - public IPersistFolder2, - public IShellExtInit, - public IShellFolder2, - public IOleCommandTarget, - public IShellFolderViewCB, - public IShellExecuteHookW -{ - public: - CNetworkConnections(); - - /* IUnknown */ - virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); - virtual ULONG WINAPI AddRef(); - virtual ULONG WINAPI Release(); - - // IPersistFolder2 - virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); - virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); - virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl); - - // IShellFolder - virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); - virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); - virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); - - // IShellFolder2 - virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); - virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); - virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); - virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); - virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); - - // IShellExtInit - virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); - - // IOleCommandTarget - virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText); - - // IShellFolderViewCB - virtual HRESULT WINAPI MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); - - // IShellExecuteHookW - virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOW pei); - - private: - ~CNetworkConnections(); - - LONG m_ref; - /* both paths are parsible from the desktop */ - PIDLIST_ABSOLUTE m_pidlRoot; - IOleCommandTarget *m_lpOleCmd; -}; - -class CNetConUiObject final : - public IContextMenu3, - public IObjectWithSite, - public IQueryInfo, - public IExtractIconW -{ - public: - CNetConUiObject(PCUITEMID_CHILD pidl, IOleCommandTarget *lpOleCmd); - - // IUnknown - virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); - virtual ULONG WINAPI AddRef(); - virtual ULONG WINAPI Release(); - - // IContextMenu3 - virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax); - virtual HRESULT WINAPI HandleMenuMsg( UINT uMsg, WPARAM wParam, LPARAM lParam); - virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); - - // IObjectWithSite - virtual HRESULT WINAPI SetSite(IUnknown *punk); - virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite); - - // IQueryInfo - virtual HRESULT WINAPI GetInfoFlags(DWORD *pdwFlags); - virtual HRESULT WINAPI GetInfoTip(DWORD dwFlags, WCHAR **ppwszTip); - - // IExtractIconW - virtual HRESULT STDMETHODCALLTYPE GetIconLocation(UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags); - virtual HRESULT STDMETHODCALLTYPE Extract(LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); - - private: - ~CNetConUiObject(); - - LONG m_ref; - PCUITEMID_CHILD m_pidl; - IUnknown *m_pUnknown; - IOleCommandTarget *m_lpOleCmd; -}; - static const shvheader NetConnectSFHeader[] = { {IDS_SHV_COLUMN_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 20}, {IDS_SHV_COLUMN_TYPE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 8}, @@ -160,7 +54,6 @@ static const shvheader NetConnectSFHeader[] = { HRESULT ShowNetConnectionStatus(IOleCommandTarget * lpOleCmd, INetConnection * pNetConnect, HWND hwnd); CNetworkConnections::CNetworkConnections() : - m_ref(0), m_pidlRoot(_ILCreateNetConnect()) { HRESULT hr; @@ -179,71 +72,6 @@ CNetworkConnections::~CNetworkConnections() SHFree(m_pidlRoot); } -/************************************************************************** - * ISF_NetConnect_fnQueryInterface - * - * NOTE - * supports not IPersist/IPersistFolder - */ -HRESULT WINAPI CNetworkConnections::QueryInterface(REFIID riid, LPVOID *ppvObj) -{ - *ppvObj = NULL; - - if (IsEqualIID(riid, IID_IUnknown) || - IsEqualIID (riid, IID_IPersist) || - IsEqualIID (riid, IID_IPersistFolder) || - IsEqualIID (riid, IID_IPersistFolder2)) - { - *ppvObj = static_cast<IPersistFolder2*>(this); - } - else if (IsEqualIID(riid, IID_IShellFolder) || - IsEqualIID(riid, IID_IShellFolder2)) - { - *ppvObj = static_cast<IShellFolder2*>(this); - } - else if (IsEqualIID(riid, IID_IShellExtInit)) - { - *ppvObj = static_cast<IShellExtInit*>(this); - } - else if (IsEqualIID(riid, IID_IOleCommandTarget)) - { - *ppvObj = static_cast<IOleCommandTarget*>(this); - } - else if (IsEqualIID(riid, IID_IShellFolderViewCB)) - { - *ppvObj = static_cast<IShellFolderViewCB*>(this); - } - else if (IsEqualIID(riid, IID_IShellExecuteHookW)) - { - *ppvObj = static_cast<IShellExecuteHookW*>(this); - } - - if (*ppvObj) - { - AddRef(); - return S_OK; - } - - return E_NOINTERFACE; -} - -ULONG WINAPI CNetworkConnections::AddRef() -{ - ULONG refCount = InterlockedIncrement(&m_ref); - - return refCount; -} - -ULONG WINAPI CNetworkConnections::Release() -{ - ULONG refCount = InterlockedDecrement(&m_ref); - - if (!refCount) - delete this; - - return refCount; -} - /************************************************************************** * ISF_NetConnect_fnParseDisplayName */ @@ -260,67 +88,13 @@ HRESULT WINAPI CNetworkConnections::ParseDisplayName ( return hr; } -/************************************************************************** - * CreateNetConnectEnumList() - */ -static BOOL CreateNetConnectEnumList(CEnumIDList *list, DWORD dwFlags) -{ - HRESULT hr; - INetConnectionManager *pNetConMan; - IEnumNetConnection *pEnumCon; - INetConnection *INetCon; - ULONG Count; - PITEMID_CHILD pidl; - - /* get an instance to of IConnectionManager */ - hr = INetConnectionManager_Constructor(NULL, IID_INetConnectionManager, (LPVOID*)&pNetConMan); - if (FAILED(hr)) - return FALSE; - - hr = pNetConMan->EnumConnections(NCME_DEFAULT, &pEnumCon); - if (FAILED(hr)) - { - pNetConMan->Release(); - return FALSE; - } - - do - { - hr = pEnumCon->Next(1, &INetCon, &Count); - if (hr == S_OK) - { - pidl = ILCreateNetConnectItem(INetCon); - if (pidl) - { - list->AddToEnumList(pidl); - } - } - else - { - break; - } - } while (TRUE); - - pEnumCon->Release(); - pNetConMan->Release(); - - return TRUE; -} - /************************************************************************** * ISF_NetConnect_fnEnumObjects */ HRESULT WINAPI CNetworkConnections::EnumObjects( HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - CEnumIDList *pList = new CEnumIDList; - *ppEnumIDList = static_cast<LPENUMIDLIST>(pList); - if (!pList) - return E_OUTOFMEMORY; - - pList->AddRef(); - CreateNetConnectEnumList(pList, dwFlags); - return S_OK; + return CEnumIDList_CreateInstance(hwndOwner, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** @@ -454,18 +228,6 @@ HRESULT WINAPI CNetworkConnections::GetAttributesOf( * */ -HRESULT IContextMenuImpl_Constructor(REFIID riid, PCUITEMID_CHILD pidl, LPVOID * ppvOut, IOleCommandTarget * lpOleCmd) -{ - CNetConUiObject *pMenu = new CNetConUiObject(pidl, lpOleCmd); - if (!pMenu) - return E_OUTOFMEMORY; - - pMenu->AddRef(); - HRESULT hr = pMenu->QueryInterface(riid, ppvOut); - pMenu->Release(); - return hr; -} - HRESULT WINAPI CNetworkConnections::GetUIObjectOf( HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) @@ -481,7 +243,7 @@ HRESULT WINAPI CNetworkConnections::GetUIObjectOf( if ((IsEqualIID(riid, IID_IContextMenu) || IsEqualIID (riid, IID_IContextMenu2) || IsEqualIID(riid, IID_IContextMenu3) || IsEqualIID(riid, IID_IQueryInfo) || IsEqualIID(riid, IID_IExtractIconW)) && cidl >= 1) { - return IContextMenuImpl_Constructor(riid, apidl[0], ppvOut, m_lpOleCmd); + return ShellObjectCreatorInit<CNetConUiObject>(apidl[0], m_lpOleCmd, riid, ppvOut); } else hr = E_NOINTERFACE; @@ -725,14 +487,11 @@ HRESULT WINAPI CNetworkConnections::MapColumnToSCID(UINT column, SHCOLUMNID *psc * IContextMenu2 Implementation */ -CNetConUiObject::CNetConUiObject(PCUITEMID_CHILD pidl, IOleCommandTarget *lpOleCmd) - : m_ref(0), - m_pidl(pidl), +CNetConUiObject::CNetConUiObject() + : m_pidl(NULL), m_pUnknown(NULL), - m_lpOleCmd(lpOleCmd) + m_lpOleCmd(NULL) { - if (m_lpOleCmd) - m_lpOleCmd->AddRef(); } CNetConUiObject::~CNetConUiObject() @@ -741,55 +500,13 @@ CNetConUiObject::~CNetConUiObject() m_lpOleCmd->Release(); } -/************************************************************************ - * ISF_NetConnect_IContextMenu_QueryInterface - */ -HRESULT WINAPI CNetConUiObject::QueryInterface(REFIID iid, LPVOID *ppvObject) -{ - *ppvObject = NULL; - - if (IsEqualIID(iid, IID_IContextMenu) || IsEqualIID(iid, IID_IContextMenu2) || IsEqualIID(iid, IID_IContextMenu3)) - *ppvObject = static_cast<IContextMenu3*>(this); - else if (IsEqualIID(iid, IID_IObjectWithSite)) - *ppvObject = static_cast<IObjectWithSite*>(this); - else if (IsEqualIID(iid, IID_IQueryInfo)) - *ppvObject = static_cast<IQueryInfo*>(this); - else if (IsEqualIID(iid, IID_IExtractIconW)) - *ppvObject = static_cast<IExtractIconW*>(this); - - if (*ppvObject) - { - AddRef(); - return S_OK; - } - - return E_NOINTERFACE; -} - -/************************************************************************ - * ISF_NetConnect_IContextMenu_AddRef - */ -ULONG WINAPI CNetConUiObject::AddRef() -{ - ULONG refCount; - - refCount = InterlockedIncrement(&m_ref); - - return refCount; -} - -/************************************************************************ - * ISF_NetConnect_IContextMenu_Release - */ -ULONG WINAPI CNetConUiObject::Release() +HRESULT WINAPI CNetConUiObject::Initialize(PCUITEMID_CHILD pidl, IOleCommandTarget *lpOleCmd) { - ULONG refCount; - - refCount = InterlockedDecrement(&m_ref); - if (!refCount) - delete this; - - return refCount; + m_pidl = pidl; + m_lpOleCmd = lpOleCmd; + if (m_lpOleCmd) + m_lpOleCmd->AddRef(); + return S_OK; } void WINAPI _InsertMenuItemW ( @@ -1294,26 +1011,3 @@ HRESULT WINAPI CNetConUiObject::GetInfoTip(DWORD dwFlags, WCHAR **ppwszTip) *ppwszTip = NULL; return S_OK; } - -/************************************************************************** -* ISF_NetConnect_Constructor -*/ -HRESULT WINAPI ISF_NetConnect_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) -{ - TRACE("ISF_NetConnect_Constructor\n"); - - if (!ppv) - return E_POINTER; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - CNetworkConnections *pnc = new CNetworkConnections; - if (!pnc) - return E_OUTOFMEMORY; - - pnc->AddRef(); - HRESULT hr = pnc->QueryInterface(riid, ppv); - pnc->Release(); - - return hr; -} diff --git a/dll/shellext/netshell/shfldr_netconnect.h b/dll/shellext/netshell/shfldr_netconnect.h new file mode 100644 index 0000000000..2c541ad3bd --- /dev/null +++ b/dll/shellext/netshell/shfldr_netconnect.h @@ -0,0 +1,137 @@ + + +typedef struct { + int colnameid; + int pcsFlags; + int fmt; + int cxChar; +} shvheader; + +class CNetworkConnections: + public CComCoClass<CNetworkConnections, &CLSID_ConnectionFolder>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IPersistFolder2, + public IShellExtInit, + public IShellFolder2, + public IOleCommandTarget, + public IShellFolderViewCB, + public IShellExecuteHookW +{ + public: + CNetworkConnections(); + ~CNetworkConnections(); + + // IPersistFolder2 + virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); + virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl); + + // IShellFolder + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); + virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); + + // IShellFolder2 + virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); + virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); + virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); + virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); + + // IShellExtInit + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); + + // IOleCommandTarget + virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText); + + // IShellFolderViewCB + virtual HRESULT WINAPI MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); + + // IShellExecuteHookW + virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOW pei); + + private: + + /* both paths are parsible from the desktop */ + PIDLIST_ABSOLUTE m_pidlRoot; + IOleCommandTarget *m_lpOleCmd; + + public: + + BEGIN_COM_MAP(CNetworkConnections) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersistFolder2) + COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder2) + COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) + COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder2) + COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewCB, IShellFolderViewCB) + COM_INTERFACE_ENTRY_IID(IID_IShellExecuteHookW, IShellExecuteHookW) + END_COM_MAP() + + DECLARE_NO_REGISTRY() + DECLARE_NOT_AGGREGATABLE(CNetworkConnections) + DECLARE_PROTECT_FINAL_CONSTRUCT() +}; + +class CNetConUiObject: + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IContextMenu3, + public IObjectWithSite, + public IQueryInfo, + public IExtractIconW +{ + private: + PCUITEMID_CHILD m_pidl; + IUnknown *m_pUnknown; + IOleCommandTarget *m_lpOleCmd; + + public: + CNetConUiObject(); + ~CNetConUiObject(); + HRESULT WINAPI Initialize(PCUITEMID_CHILD pidl, IOleCommandTarget *lpOleCmd); + + // IContextMenu3 + virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici); + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax); + virtual HRESULT WINAPI HandleMenuMsg( UINT uMsg, WPARAM wParam, LPARAM lParam); + virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); + + // IObjectWithSite + virtual HRESULT WINAPI SetSite(IUnknown *punk); + virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite); + + // IQueryInfo + virtual HRESULT WINAPI GetInfoFlags(DWORD *pdwFlags); + virtual HRESULT WINAPI GetInfoTip(DWORD dwFlags, WCHAR **ppwszTip); + + // IExtractIconW + virtual HRESULT STDMETHODCALLTYPE GetIconLocation(UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags); + virtual HRESULT STDMETHODCALLTYPE Extract(LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); + + BEGIN_COM_MAP(CNetConUiObject) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu3) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu3) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IQueryInfo, IQueryInfo) + COM_INTERFACE_ENTRY_IID(IID_IExtractIconW, IExtractIconW) + END_COM_MAP() + + DECLARE_NOT_AGGREGATABLE(CNetConUiObject) + DECLARE_PROTECT_FINAL_CONSTRUCT() +}; + +HRESULT ShowNetConnectionProperties(INetConnection * pNetConnect, HWND hwnd);

6 years, 1 month

01/09: [NETSHELL] Add missing license headers Since one of the first files in the module (shfldr_netconnect.c) used the LGPL2.1+ license, all the other files have the same license

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d47872ea087497a11d0c… commit 8d47872ea087497a11d0c1614c893bfb4e682679 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Nov 16 13:24:03 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Nov 18 14:01:54 2018 +0200 [NETSHELL] Add missing license headers Since one of the first files in the module (shfldr_netconnect.c) used the LGPL2.1+ license, all the other files have the same license --- dll/shellext/netshell/connectmanager.cpp | 7 +++++++ dll/shellext/netshell/enumlist.cpp | 7 +++++++ dll/shellext/netshell/lanconnectui.cpp | 7 +++++++ dll/shellext/netshell/lanstatusui.cpp | 7 +++++++ dll/shellext/netshell/netshell.cpp | 7 +++++++ dll/shellext/netshell/setup.cpp | 7 +++++++ dll/shellext/netshell/shfldr_netconnect.cpp | 7 +++++++ 7 files changed, 49 insertions(+) diff --git a/dll/shellext/netshell/connectmanager.cpp b/dll/shellext/netshell/connectmanager.cpp index 8b33b59ce0..f71d58f81a 100644 --- a/dll/shellext/netshell/connectmanager.cpp +++ b/dll/shellext/netshell/connectmanager.cpp @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: CNetConnectionManager class + * COPYRIGHT: Copyright 2008 Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + #include "precomp.h" typedef struct tagINetConnectionItem diff --git a/dll/shellext/netshell/enumlist.cpp b/dll/shellext/netshell/enumlist.cpp index fa1f479f51..9dc629cccc 100644 --- a/dll/shellext/netshell/enumlist.cpp +++ b/dll/shellext/netshell/enumlist.cpp @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: CNetworkConnections Shell Folder items enumerator + * COPYRIGHT: Copyright 2008 Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + #include "precomp.h" /************************************************************************** diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index 6d1037f6bf..4722b914f5 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: CNetConnectionPropertyUi: Network connection configuration dialog + * COPYRIGHT: Copyright 2008 Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + #include "precomp.h" #include <netcfgx.h> diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 7c366444ea..19e3beca92 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: CLanStatus: Lan connection status dialog + * COPYRIGHT: Copyright 2008 Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + #include "precomp.h" #include <winsock.h> diff --git a/dll/shellext/netshell/netshell.cpp b/dll/shellext/netshell/netshell.cpp index cc37a24102..0aaab32f6e 100644 --- a/dll/shellext/netshell/netshell.cpp +++ b/dll/shellext/netshell/netshell.cpp @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: ReactOS Networking Configuration + * COPYRIGHT: Copyright 2008 Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + #include "precomp.h" #include <olectl.h> diff --git a/dll/shellext/netshell/setup.cpp b/dll/shellext/netshell/setup.cpp index dc1264ac37..f6275cc90b 100644 --- a/dll/shellext/netshell/setup.cpp +++ b/dll/shellext/netshell/setup.cpp @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: ReactOS Networking Configuration + * COPYRIGHT: Copyright 2016 Eric Kohl + */ + #include "precomp.h" #include <syssetup/syssetup.h> diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index 3866121424..91e12020d6 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: CNetworkConnections Shell Folder + * COPYRIGHT: Copyright 2008 Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + /* * Network Connections Shell Folder *

6 years, 1 month

01/01: [MC] Add messages 3301-3421 to netmsg.dll and renamed messages 3500-3547.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ab3a1f2d58db613828f5… commit 0ab3a1f2d58db613828f5d265f3971e2c81bb1d8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 18 10:54:28 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 18 10:54:28 2018 +0100 [MC] Add messages 3301-3421 to netmsg.dll and renamed messages 3500-3547. --- sdk/include/reactos/mc/netmsgmsg.mc | 374 ++++++++++++++++++++++++++++++++---- 1 file changed, 334 insertions(+), 40 deletions(-) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 5c424cdeff..2cef4c34fc 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -5178,13 +5178,307 @@ Language=Russian ; -; other message definitions +; msgtext.h (non-public) message definitions (3300 - 3499 MTXT_BASE) +; + +MessageId=3301 +Severity=Success +Facility=System +SymbolicName=MTXT_3301 +Language=English +Remote IPC %0 +. +Language=Russian +Remote IPC %0 +. + +MessageId=3302 +Severity=Success +Facility=System +SymbolicName=MTXT_3302 +Language=English +Remote Admin %0 +. +Language=Russian +Remote Admin %0 +. + +MessageId=3303 +Severity=Success +Facility=System +SymbolicName=MTXT_3303 +Language=English +Logon server share %0 +. +Language=Russian +Logon server share %0 +. + +MessageId=3304 +Severity=Success +Facility=System +SymbolicName=MTXT_3304 +Language=English +A network error occurred. %0 +. +Language=Russian +A network error occurred. %0 +. + +MessageId=3400 +Severity=Success +Facility=System +SymbolicName=MTXT_3400 +Language=English +There is not enough memory to start the Workstation service. +. +Language=Russian +There is not enough memory to start the Workstation service. +. + +MessageId=3401 +Severity=Success +Facility=System +SymbolicName=MTXT_3401 +Language=English +An error occurred when reading the NETWORKS entry in the LANMAN.INI file. +. +Language=Russian +An error occurred when reading the NETWORKS entry in the LANMAN.INI file. +. + +MessageId=3402 +Severity=Success +Facility=System +SymbolicName=MTXT_3402 +Language=English +This is an invalid argument: %1. +. +Language=Russian +This is an invalid argument: %1. +. + +MessageId=3403 +Severity=Success +Facility=System +SymbolicName=MTXT_3403 +Language=English +The %1 NETWORKS entry in the LANMAN.INI file has a\nsyntax error and will be ignored. +. +Language=Russian +The %1 NETWORKS entry in the LANMAN.INI file has a\nsyntax error and will be ignored. +. + +MessageId=3404 +Severity=Success +Facility=System +SymbolicName=MTXT_3404 +Language=English +There are too many NETWORKS entries in the LANMAN.INI file. +. +Language=Russian +There are too many NETWORKS entries in the LANMAN.INI file. +. + +MessageId=3406 +Severity=Success +Facility=System +SymbolicName=MTXT_3406 +Language=English +An error occurred when opening network\ndevice driver %1 = %2. +. +Language=Russian +An error occurred when opening network\ndevice driver %1 = %2. +. + +MessageId=3407 +Severity=Success +Facility=System +SymbolicName=MTXT_3407 +Language=English +Device driver %1 sent a bad BiosLinkage response. +. +Language=Russian +Device driver %1 sent a bad BiosLinkage response. +. + +MessageId=3408 +Severity=Success +Facility=System +SymbolicName=MTXT_3408 +Language=English +The program cannot be used with this operating system. +. +Language=Russian +The program cannot be used with this operating system. +. + +MessageId=3409 +Severity=Success +Facility=System +SymbolicName=MTXT_3409 +Language=English +The redirector is already installed. +. +Language=Russian +The redirector is already installed. +. + +MessageId=3410 +Severity=Success +Facility=System +SymbolicName=MTXT_3410 +Language=English +Installing NETWKSTA.SYS Version %1.%2.%3 (%4)\n +. +Language=Russian +Installing NETWKSTA.SYS Version %1.%2.%3 (%4)\n +. + +MessageId=3411 +Severity=Success +Facility=System +SymbolicName=MTXT_3411 +Language=English +There was an error installing NETWKSTA.SYS.\n\n +Press ENTER to continue. +. +Language=Russian +There was an error installing NETWKSTA.SYS.\n\n +Press ENTER to continue. +. + +MessageId=3412 +Severity=Success +Facility=System +SymbolicName=MTXT_3412 +Language=English +Resolver linkage problem. +. +Language=Russian +Resolver linkage problem. +. + +MessageId=3413 +Severity=Success +Facility=System +SymbolicName=MTXT_3413 +Language=English +Your logon time at %1 ends at %2.\n +Please clean up and log off. +. +Language=Russian +Your logon time at %1 ends at %2.\n +Please clean up and log off. +. + +MessageId=3414 +Severity=Success +Facility=System +SymbolicName=MTXT_3414 +Language=English +You will be automatically disconnected at %1. +. +Language=Russian +You will be automatically disconnected at %1. +. + +MessageId=3415 +Severity=Success +Facility=System +SymbolicName=MTXT_3415 +Language=English +Your logon time at %1 has ended. +. +Language=Russian +Your logon time at %1 has ended. +. + +MessageId=3416 +Severity=Success +Facility=System +SymbolicName=MTXT_3416 +Language=English +Your logon time at %1 ended at %2. +. +Language=Russian +Your logon time at %1 ended at %2. +. + +MessageId=3417 +Severity=Success +Facility=System +SymbolicName=MTXT_3417 +Language=English +WARNING: You have until %1 to logoff. If you\n +have not logged off at this time, your session will be\n +disconnected, and any open files or devices you\n +have open may lose data." +. +Language=Russian +WARNING: You have until %1 to logoff. If you\n +have not logged off at this time, your session will be\n +disconnected, and any open files or devices you\n +have open may lose data." +. + +MessageId=3418 +Severity=Success +Facility=System +SymbolicName=MTXT_3418 +Language=English +WARNING: You must log off at %1 now. You have\n +two minutes to log off, or you will be disconnected. +. +Language=Russian +WARNING: You must log off at %1 now. You have\n +two minutes to log off, or you will be disconnected. +. + +MessageId=3419 +Severity=Success +Facility=System +SymbolicName=MTXT_3419 +Language=English +You have open files or devices, and a forced\n +disconnection may cause you to lose data. +. +Language=Russian +You have open files or devices, and a forced\n +disconnection may cause you to lose data. +. + +MessageId=3420 +Severity=Success +Facility=System +SymbolicName=MTXT_3420 +Language=English +Default Share for Internal Use %0 +. +Language=Russian +Default Share for Internal Use %0 +. + +MessageId=3421 +Severity=Success +Facility=System +SymbolicName=MTXT_3421 +Language=English +Messenger Service %0 +. +Language=Russian +Messenger Service %0 +. + + +; +; apperr.h (non-public) message definitions (3500 - 3999 APPERR_BASE) ; MessageId=3500 Severity=Success Facility=System -SymbolicName=OTHER_3500 +SymbolicName=APPERR_3500 Language=English The command completed successfully. . @@ -5195,7 +5489,7 @@ The command completed successfully. MessageId=3501 Severity=Success Facility=System -SymbolicName=OTHER_3501 +SymbolicName=APPERR_3501 Language=English You used an invalid option. . @@ -5206,7 +5500,7 @@ You used an invalid option. MessageId=3502 Severity=Success Facility=System -SymbolicName=OTHER_3502 +SymbolicName=APPERR_3502 Language=English System error %1 has occurred. . @@ -5217,7 +5511,7 @@ System error %1 has occurred. MessageId=3503 Severity=Success Facility=System -SymbolicName=OTHER_3503 +SymbolicName=APPERR_3503 Language=English The command contains an invalid number of arguments. . @@ -5228,7 +5522,7 @@ The command contains an invalid number of arguments. MessageId=3504 Severity=Success Facility=System -SymbolicName=OTHER_3504 +SymbolicName=APPERR_3504 Language=English The command completed with one or more errors. . @@ -5239,7 +5533,7 @@ The command completed with one or more errors. MessageId=3505 Severity=Success Facility=System -SymbolicName=OTHER_3505 +SymbolicName=APPERR_3505 Language=English You used an option with an invalid value. . @@ -5250,7 +5544,7 @@ You used an option with an invalid value. MessageId=3506 Severity=Success Facility=System -SymbolicName=OTHER_3506 +SymbolicName=APPERR_3506 Language=English The option %1 is unknown. . @@ -5261,7 +5555,7 @@ The option %1 is unknown. MessageId=3507 Severity=Success Facility=System -SymbolicName=OTHER_3507 +SymbolicName=APPERR_3507 Language=English Option %1 is ambiguous. . @@ -5272,7 +5566,7 @@ Option %1 is ambiguous. MessageId=3510 Severity=Success Facility=System -SymbolicName=OTHER_3510 +SymbolicName=APPERR_3510 Language=English A command was used with conflicting switches. . @@ -5283,7 +5577,7 @@ A command was used with conflicting switches. MessageId=3511 Severity=Success Facility=System -SymbolicName=OTHER_3511 +SymbolicName=APPERR_3511 Language=English Could not find subprogram %1. . @@ -5294,7 +5588,7 @@ Could not find subprogram %1. MessageId=3512 Severity=Success Facility=System -SymbolicName=OTHER_3512 +SymbolicName=APPERR_3512 Language=English The software requires a newer version of the operating\nsystem. . @@ -5305,7 +5599,7 @@ The software requires a newer version of the operating\nsystem. MessageId=3513 Severity=Success Facility=System -SymbolicName=OTHER_3513 +SymbolicName=APPERR_3513 Language=English More data is available than can be returned by the operating\nsystem. . @@ -5316,7 +5610,7 @@ More data is available than can be returned by the operating\nsystem. MessageId=3514 Severity=Success Facility=System -SymbolicName=OTHER_3514 +SymbolicName=APPERR_3514 Language=English More help is available by typing NET HELPMSG %1. . @@ -5327,7 +5621,7 @@ More help is available by typing NET HELPMSG %1. MessageId=3515 Severity=Success Facility=System -SymbolicName=OTHER_3515 +SymbolicName=APPERR_3515 Language=English The command can be used only on a Domain Controller. . @@ -5338,7 +5632,7 @@ The command can be used only on a Domain Controller. MessageId=3516 Severity=Success Facility=System -SymbolicName=OTHER_3516 +SymbolicName=APPERR_3516 Language=English This command cannot be used on a Domain Controller. . @@ -5349,7 +5643,7 @@ This command cannot be used on a Domain Controller. MessageId=3520 Severity=Success Facility=System -SymbolicName=OTHER_3520 +SymbolicName=APPERR_3520 Language=English These services are started: . @@ -5360,7 +5654,7 @@ These services are started: MessageId=3521 Severity=Success Facility=System -SymbolicName=OTHER_3521 +SymbolicName=APPERR_3521 Language=English The %1 service is not started. . @@ -5371,7 +5665,7 @@ The %1 service is not started. MessageId=3522 Severity=Success Facility=System -SymbolicName=OTHER_3522 +SymbolicName=APPERR_3522 Language=English The %1 service is starting%0 . @@ -5382,7 +5676,7 @@ The %1 service is starting%0 MessageId=3523 Severity=Success Facility=System -SymbolicName=OTHER_3523 +SymbolicName=APPERR_3523 Language=English The %1 service could not be started. . @@ -5393,7 +5687,7 @@ The %1 service could not be started. MessageId=3524 Severity=Success Facility=System -SymbolicName=OTHER_3524 +SymbolicName=APPERR_3524 Language=English The %1 service was started successfully. . @@ -5404,7 +5698,7 @@ The %1 service was started successfully. MessageId=3525 Severity=Success Facility=System -SymbolicName=OTHER_3525 +SymbolicName=APPERR_3525 Language=English Stopping the Workstation service also stops the Server service. . @@ -5415,7 +5709,7 @@ Stopping the Workstation service also stops the Server service. MessageId=3526 Severity=Success Facility=System -SymbolicName=OTHER_3526 +SymbolicName=APPERR_3526 Language=English The workstation has open files. . @@ -5426,7 +5720,7 @@ The workstation has open files. MessageId=3527 Severity=Success Facility=System -SymbolicName=OTHER_3527 +SymbolicName=APPERR_3527 Language=English The %1 service is stopping%0 . @@ -5437,7 +5731,7 @@ The %1 service is stopping%0 MessageId=3528 Severity=Success Facility=System -SymbolicName=OTHER_3528 +SymbolicName=APPERR_3528 Language=English The %1 service could not be stopped. . @@ -5448,7 +5742,7 @@ The %1 service could not be stopped. MessageId=3529 Severity=Success Facility=System -SymbolicName=OTHER_3529 +SymbolicName=APPERR_3529 Language=English The %1 service was stopped successfully. . @@ -5459,7 +5753,7 @@ The %1 service was stopped successfully. MessageId=3530 Severity=Success Facility=System -SymbolicName=OTHER_3530 +SymbolicName=APPERR_3530 Language=English The following services are dependent on the %1 service.\nStopping the %1 service will also stop these services. . @@ -5470,7 +5764,7 @@ The following services are dependent on the %1 service.\nStopping the %1 service MessageId=3533 Severity=Success Facility=System -SymbolicName=OTHER_3533 +SymbolicName=APPERR_3533 Language=English The service is starting or stopping. Please try again later. . @@ -5481,7 +5775,7 @@ The service is starting or stopping. Please try again later. MessageId=3534 Severity=Success Facility=System -SymbolicName=OTHER_3534 +SymbolicName=APPERR_3534 Language=English The service did not report an error. . @@ -5492,7 +5786,7 @@ The service did not report an error. MessageId=3535 Severity=Success Facility=System -SymbolicName=OTHER_3535 +SymbolicName=APPERR_3535 Language=English An error occurred controlling the device. . @@ -5503,7 +5797,7 @@ An error occurred controlling the device. MessageId=3536 Severity=Success Facility=System -SymbolicName=OTHER_3536 +SymbolicName=APPERR_3536 Language=English The %1 service was continued successfully. . @@ -5514,7 +5808,7 @@ The %1 service was continued successfully. MessageId=3537 Severity=Success Facility=System -SymbolicName=OTHER_3537 +SymbolicName=APPERR_3537 Language=English The %1 service was paused successfully. . @@ -5525,7 +5819,7 @@ The %1 service was paused successfully. MessageId=3538 Severity=Success Facility=System -SymbolicName=OTHER_3538 +SymbolicName=APPERR_3538 Language=English The %1 service failed to resume. . @@ -5536,7 +5830,7 @@ The %1 service failed to resume. MessageId=3539 Severity=Success Facility=System -SymbolicName=OTHER_3539 +SymbolicName=APPERR_3539 Language=English The %1 service failed to pause. . @@ -5547,7 +5841,7 @@ The %1 service failed to pause. MessageId=3540 Severity=Success Facility=System -SymbolicName=OTHER_3540 +SymbolicName=APPERR_3540 Language=English The %1 service continue is pending%0 . @@ -5558,7 +5852,7 @@ The %1 service continue is pending%0 MessageId=3541 Severity=Success Facility=System -SymbolicName=OTHER_3541 +SymbolicName=APPERR_3541 Language=English The %1 service pause is pending%0 . @@ -5569,7 +5863,7 @@ The %1 service pause is pending%0 MessageId=3542 Severity=Success Facility=System -SymbolicName=OTHER_3542 +SymbolicName=APPERR_3542 Language=English %1 was continued successfully. . @@ -5580,7 +5874,7 @@ Language=Russian MessageId=3543 Severity=Success Facility=System -SymbolicName=OTHER_3543 +SymbolicName=APPERR_3543 Language=English %1 was paused successfully. . @@ -5591,7 +5885,7 @@ Language=Russian MessageId=3544 Severity=Success Facility=System -SymbolicName=OTHER_3544 +SymbolicName=APPERR_3544 Language=English The %1 service has been started by another process and is pending.%0 . @@ -5602,7 +5896,7 @@ The %1 service has been started by another process and is pending.%0 MessageId=3547 Severity=Success Facility=System -SymbolicName=OTHER_3547 +SymbolicName=APPERR_3547 Language=English A service specific error occurred: %1. .

6 years, 1 month

03/03: [MPR] Drop a nasty ReactOS specific hack

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e024bfeb689a9004b0ba… commit 5e024bfeb689a9004b0ba9ad576a64fee61d8581 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 17 22:01:13 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 17 22:13:34 2018 +0100 [MPR] Drop a nasty ReactOS specific hack That hack (cf. previous commit) was used to restore all the saved connections. But, because it was implemented in the wrong place, each time the MPR DLL was attached, it was trying to restore connections. With that commit and the previous one, now, ReactOS has a correct behavior (it tries to bring back connections only at session opening) and will reduce "workload" for applications attaching MPR dll. CORE-15310 --- dll/win32/mpr/wnet.c | 137 --------------------------------------------------- 1 file changed, 137 deletions(-) diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index 14192c8245..2d2d7e10f7 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -296,85 +296,6 @@ static void _tryLoadProvider(PCWSTR provider) debugstr_w(provider)); } -#ifdef __REACTOS__ -static void _restoreSavedConnection(HKEY connection, WCHAR * local) -{ - NETRESOURCEW net; - DWORD type, prov, index, size; - - net.lpProvider = NULL; - net.lpRemoteName = NULL; - net.lpLocalName = NULL; - - TRACE("Restoring: %S\n", local); - - size = sizeof(DWORD); - if (RegQueryValueExW(connection, L"ConnectionType", NULL, &type, (BYTE *)&net.dwType, &size) != ERROR_SUCCESS) - return; - - if (type != REG_DWORD || size != sizeof(DWORD)) - return; - - if (RegQueryValueExW(connection, L"ProviderName", NULL, &type, NULL, &size) != ERROR_SUCCESS) - return; - - if (type != REG_SZ) - return; - - net.lpProvider = HeapAlloc(GetProcessHeap(), 0, size); - if (!net.lpProvider) - return; - - if (RegQueryValueExW(connection, L"ProviderName", NULL, NULL, (BYTE *)net.lpProvider, &size) != ERROR_SUCCESS) - goto cleanup; - - size = sizeof(DWORD); - if (RegQueryValueExW(connection, L"ProviderType", NULL, &type, (BYTE *)&prov, &size) != ERROR_SUCCESS) - goto cleanup; - - if (type != REG_DWORD || size != sizeof(DWORD)) - goto cleanup; - - index = _findProviderIndexW(net.lpProvider); - if (index == BAD_PROVIDER_INDEX) - goto cleanup; - - if (providerTable->table[index].dwNetType != prov) - goto cleanup; - - if (RegQueryValueExW(connection, L"RemotePath", NULL, &type, NULL, &size) != ERROR_SUCCESS) - goto cleanup; - - if (type != REG_SZ) - goto cleanup; - - net.lpRemoteName = HeapAlloc(GetProcessHeap(), 0, size); - if (!net.lpRemoteName) - goto cleanup; - - if (RegQueryValueExW(connection, L"RemotePath", NULL, NULL, (BYTE *)net.lpRemoteName, &size) != ERROR_SUCCESS) - goto cleanup; - - size = strlenW(local); - net.lpLocalName = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR) + 2 * sizeof(WCHAR)); - if (!net.lpLocalName) - goto cleanup; - - strcpyW(net.lpLocalName, local); - net.lpLocalName[size] = ':'; - net.lpLocalName[size + 1] = 0; - - TRACE("Attempting connection\n"); - - WNetAddConnection2W(&net, NULL, NULL, 0); - -cleanup: - HeapFree(GetProcessHeap(), 0, net.lpProvider); - HeapFree(GetProcessHeap(), 0, net.lpRemoteName); - HeapFree(GetProcessHeap(), 0, net.lpLocalName); -} -#endif - void wnetInit(HINSTANCE hInstDll) { static const WCHAR providerOrderKey[] = { 'S','y','s','t','e','m','\\', @@ -453,64 +374,6 @@ void wnetInit(HINSTANCE hInstDll) } RegCloseKey(hKey); } - -#ifdef __REACTOS__ - if (providerTable) - { - HKEY user_profile; - - if (RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) - { - HKEY network; - WCHAR subkey[8] = {'N', 'e', 't', 'w', 'o', 'r', 'k', 0}; - - if (RegOpenKeyExW(user_profile, subkey, 0, KEY_READ, &network) == ERROR_SUCCESS) - { - DWORD size, max; - - TRACE("Enumerating remembered connections\n"); - - if (RegQueryInfoKey(network, NULL, NULL, NULL, &max, &size, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) - { - WCHAR *local; - - TRACE("There are %lu connections\n", max); - - local = HeapAlloc(GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR)); - if (local) - { - DWORD index; - - for (index = 0; index < max; ++index) - { - DWORD len = size + 1; - HKEY connection; - - TRACE("Trying connection %lu\n", index); - - if (RegEnumKeyExW(network, index, local, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) - continue; - - TRACE("It is %S\n", local); - - if (RegOpenKeyExW(network, local, 0, KEY_READ, &connection) != ERROR_SUCCESS) - continue; - - _restoreSavedConnection(connection, local); - RegCloseKey(connection); - } - - HeapFree(GetProcessHeap(), 0, local); - } - } - - RegCloseKey(network); - } - - RegCloseKey(user_profile); - } - } -#endif } void wnetFree(void)

6 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2018