[tfaber] 67316: [NETSHELL][COM_APITEST] - Remove another MessageBox... - Also test some more interfaces found in netshell classes
Author: tfaber Date: Sun Apr 19 22:50:25 2015 New Revision: 67316
URL: http://svn.reactos.org/svn/reactos?rev=67316&view=rev Log: [NETSHELL][COM_APITEST] - Remove another MessageBox... - Also test some more interfaces found in netshell classes
Added: trunk/rostests/apitests/com/netcfgx.c (with props) Modified: trunk/reactos/dll/shellext/netshell/lanconnectui.cpp trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp trunk/rostests/apitests/com/CMakeLists.txt trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/netshell.c trunk/rostests/apitests/com/shdocvw.c trunk/rostests/apitests/com/testlist.c
Modified: trunk/reactos/dll/shellext/netshell/lanconnectui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lanco... ============================================================================== --- trunk/reactos/dll/shellext/netshell/lanconnectui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lanconnectui.cpp [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -25,9 +25,9 @@ } NET_ITEM, *PNET_ITEM;
class CNetConnectionPropertyUi final : + public INetConnectionConnectUi, public INetConnectionPropertyUi2, - public INetLanConnectionUiInfo, - public INetConnectionConnectUi + public INetLanConnectionUiInfo { public: CNetConnectionPropertyUi(); @@ -522,7 +522,6 @@ REFIID iid, LPVOID *ppvObj) { - LPOLESTR pStr; *ppvObj = NULL;
if (IsEqualIID (iid, IID_IUnknown) || @@ -546,9 +545,6 @@ return S_OK; }
- StringFromCLSID((CLSID)iid, &pStr); - MessageBoxW(NULL, pStr, L"INetConnectionPropertyUi_fnQueryInterface", MB_OK); - CoTaskMemFree(pStr); return E_NOINTERFACE; }
Modified: trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/shfld... ============================================================================== --- trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -706,9 +706,6 @@ return S_OK; }
- //LPOLESTR pStr; - //StringFromCLSID(iid, &pStr); - //MessageBoxW(NULL, L"ISF_NetConnect_IContextMenu2_QueryInterface unhandled", pStr, MB_OK); return E_NOINTERFACE; }
Modified: trunk/rostests/apitests/com/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/CMakeLists.tx... ============================================================================== --- trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -4,6 +4,7 @@ list(APPEND SOURCE browseui.c ieframe.c + netcfgx.c netshell.c shdocvw.c shell32.c
Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.c... ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -110,6 +110,9 @@ { ID_NAME(IID_IEnumExtraSearch) }, { ID_NAME(IID_IEnumGUID) }, { ID_NAME(IID_IEnumIDList) }, + //{ ID_NAME(IID_IEnumNetCfgBindingInterface) }, + //{ ID_NAME(IID_IEnumNetCfgBindingPath) }, + { ID_NAME(IID_IEnumNetCfgComponent), TRUE }, { ID_NAME(IID_IEnumNetConnection) }, { ID_NAME(IID_IEnumShellItems) }, { ID_NAME(IID_IEnumString) }, @@ -155,10 +158,20 @@ { ID_NAME(IID_IMultiQI), TRUE }, { ID_NAME(IID_INamespaceProxy), TRUE }, { ID_NAME(IID_INameSpaceTreeControl), TRUE }, + { ID_NAME(IID_INetCfg), TRUE }, + //{ ID_NAME(IID_INetCfgBindingInterface) }, + //{ ID_NAME(IID_INetCfgBindingPath) }, + { ID_NAME(IID_INetCfgComponent), TRUE }, + { ID_NAME(IID_INetCfgComponentBindings), TRUE }, + { ID_NAME(IID_INetCfgComponentControl), TRUE }, + { ID_NAME(IID_INetCfgComponentPropertyUi), TRUE }, + { ID_NAME(IID_INetCfgLock), TRUE }, + { ID_NAME(IID_INetCfgPnpReconfigCallback), TRUE }, { ID_NAME(IID_INetConnectionConnectUi), TRUE }, { ID_NAME(IID_INetConnectionPropertyUi), TRUE }, { ID_NAME(IID_INetConnectionPropertyUi2), TRUE }, { ID_NAME(IID_INetConnectionManager) }, + { ID_NAME(IID_INetLanConnectionUiInfo), TRUE }, { ID_NAME(IID_INewShortcutHookA), TRUE }, { ID_NAME(IID_INewShortcutHookW), TRUE }, { ID_NAME(IID_INSCTree), TRUE },
Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.h... ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -24,6 +24,8 @@ #include <oleacc.h> #include <oaidl.h> #include <netcon.h> +#include <netcfgx.h> +#include <netcfgn.h> #include <mshtmhst.h> #include <perhist.h> #include <shlguid.h>
Added: trunk/rostests/apitests/com/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/netcfgx.c?rev... ============================================================================== --- trunk/rostests/apitests/com/netcfgx.c (added) +++ trunk/rostests/apitests/com/netcfgx.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -0,0 +1,31 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: COM interface test for netcfgx classes + * PROGRAMMER: Thomas Faber thomas.faber@reactos.org + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_CNetCfg), + { + { 0x0, &IID_INetCfg }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_INetCfgLock }, + { 0x10, &IID_INetCfgPnpReconfigCallback }, + }, + L"Both" + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(netcfgx) +{ + TestClasses(L"netcfgx", ExpectedInterfaces, ExpectedInterfaceCount); +}
Propchange: trunk/rostests/apitests/com/netcfgx.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/rostests/apitests/com/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/netshell.c?re... ============================================================================== --- trunk/rostests/apitests/com/netshell.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/netshell.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -103,6 +103,7 @@ { 0x0, &IID_IUnknown }, { 0x4, &IID_INetConnectionPropertyUi2 }, { 0x4, &IID_INetConnectionPropertyUi }, + { 0x10, &IID_INetLanConnectionUiInfo }, }, L"Both" },
Modified: trunk/rostests/apitests/com/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shdocvw.c?rev... ============================================================================== --- trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -12,6 +12,27 @@
static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { + { + ID_NAME(CLSID_AdminFolderShortcut), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder3 }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IShellLinkA }, + { 0xc, &IID_IShellLinkW }, + { 0x10, &IID_IPersistFile }, + { 0x14, &IID_IExtractIconW }, + { 0x18, &IID_IQueryInfo }, + { 0x20, &IID_IPersistStream }, + { 0x20, &IID_IPersistStreamInit }, + { 0x24, &IID_IPersistPropertyBag }, + { 0x28, &IID_IBrowserFrameOptions }, + } + }, { ID_NAME(CLSID_ExplorerBand), {
Modified: trunk/rostests/apitests/com/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?re... ============================================================================== --- trunk/rostests/apitests/com/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/testlist.c [iso-8859-1] Sun Apr 19 22:50:25 2015 @@ -6,6 +6,7 @@ extern void func_browseui(void); extern void func_ieframe(void); extern void func_interfaces(void); +extern void func_netcfgx(void); extern void func_netshell(void); extern void func_shdocvw(void); extern void func_shell32(void); @@ -15,6 +16,7 @@ { "browseui", func_browseui }, { "ieframe", func_ieframe }, { "interfaces", func_interfaces }, + { "netcfgx", func_netcfgx }, { "netshell", func_netshell }, { "shdocvw", func_shdocvw }, { "shell32", func_shell32 },
-
tfaber＠svn.reactos.org