Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NETSHELL][COM_APITEST]

Browse source 
- Remove another MessageBox...
- Also test some more interfaces found in netshell classes

svn path=/trunk/; revision=67316
This commit is contained in:
Thomas Faber 2015-04-19 22:50:25 +00:00
parent 8083610a98
commit e7c17c0741
9 changed files with 73 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/shellext/netshell/lanconnectui.cpp
View file

@ -25,9 +25,9 @@ typedef struct
} NET_ITEM, *PNET_ITEM;
class CNetConnectionPropertyUi final :
public INetConnectionConnectUi,
public INetConnectionPropertyUi2,
public INetLanConnectionUiInfo,
public INetConnectionConnectUi
public INetLanConnectionUiInfo
{
public:
CNetConnectionPropertyUi();
@ -522,7 +522,6 @@ CNetConnectionPropertyUi::QueryInterface(
REFIID iid,
LPVOID *ppvObj)
{
LPOLESTR pStr;
*ppvObj = NULL;
if (IsEqualIID (iid, IID_IUnknown) ||
@ -546,9 +545,6 @@ CNetConnectionPropertyUi::QueryInterface(
return S_OK;
}
StringFromCLSID((CLSID)iid, &pStr);
MessageBoxW(NULL, pStr, L"INetConnectionPropertyUi_fnQueryInterface", MB_OK);
CoTaskMemFree(pStr);
return E_NOINTERFACE;
}

3
reactos/dll/shellext/netshell/shfldr_netconnect.cpp
View file

@ -706,9 +706,6 @@ HRESULT WINAPI CNetConUiObject::QueryInterface(REFIID iid, LPVOID *ppvObject)
return S_OK;
}
//LPOLESTR pStr;
//StringFromCLSID(iid, &pStr);
//MessageBoxW(NULL, L"ISF_NetConnect_IContextMenu2_QueryInterface unhandled", pStr, MB_OK);
return E_NOINTERFACE;
}

1
rostests/apitests/com/CMakeLists.txt
View file

@ -4,6 +4,7 @@ add_definitions(-DWINE_NO_UNICODE_MACROS)
list(APPEND SOURCE
browseui.c
ieframe.c
netcfgx.c
netshell.c
shdocvw.c
shell32.c

13
rostests/apitests/com/com_apitest.c
View file

@ -110,6 +110,9 @@ static KNOWN_INTERFACE KnownInterfaces[] =
{ 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 @@ static KNOWN_INTERFACE KnownInterfaces[] =
{ 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 },

2
rostests/apitests/com/com_apitest.h
View file

@ -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>

31
rostests/apitests/com/netcfgx.c Normal file
View file

@ -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);
}

1
rostests/apitests/com/netshell.c
View file

@ -103,6 +103,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
{ 0x0, &IID_IUnknown },
{ 0x4, &IID_INetConnectionPropertyUi2 },
{ 0x4, &IID_INetConnectionPropertyUi },
{ 0x10, &IID_INetLanConnectionUiInfo },
},
L"Both"
},

21
rostests/apitests/com/shdocvw.c
View file

@ -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),
{

2
rostests/apitests/com/testlist.c
View file

@ -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 @@ const struct test winetest_testlist[] =
{ "browseui", func_browseui },
{ "ieframe", func_ieframe },
{ "interfaces", func_interfaces },
{ "netcfgx", func_netcfgx },
{ "netshell", func_netshell },
{ "shdocvw", func_shdocvw },
{ "shell32", func_shell32 },