Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Name change of component implementing record parameter testing. #575

Merged
merged 1 commit into from
Jun 24, 2024
Merged

Name change of component implementing record parameter testing. #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion comtypes/test/test_dispifc_records.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Test_DispMethods(unittest.TestCase):
def _create_dispifc(self) -> "ComtypesCppTestSrvLib.IDispRecordParamTest":
# Explicitely ask for the dispinterface of the component.
return CreateObject(
"Comtypes.DispIfcParamTests",
"Comtypes.DispRecordParamTest",
clsctx=CLSCTX_LOCAL_SERVER,
interface=ComtypesCppTestSrvLib.IDispRecordParamTest,
)
Expand Down
8 changes: 4 additions & 4 deletions ...ppTestSrv/CoComtypesDispIfcParamTests.cpp → ...TestSrv/CoComtypesDispRecordParamTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

//
// CoComtypesDispIfcParamTests.cpp - Component
// CoComtypesDispRecordParamTest.cpp - Component
//
#include <objbase.h>
#include <string.h>
Expand All @@ -18,17 +18,17 @@
#include "Util.h"
#include "CUnknown.h"
#include "CFactory.h" // Needed for module handle
#include "CoComtypesDispIfcParamTests.h"
#include "CoComtypesDispRecordParamTest.h"

// We need to put this declaration here because we explicitely expose a dispinterface
// in parallel to the dual interface but dispinterfaces don't appear in the
// MIDL-generated header file.
EXTERN_C const IID DIID_IDispRecordParamTest;

static inline void trace(const char* msg)
{ Util::Trace("Component", msg, S_OK) ;}
{ Util::Trace("CoComtypesDispRecordParamTest", msg, S_OK) ;}
static inline void trace(const char* msg, HRESULT hr)
{ Util::Trace("Component", msg, hr) ;}
{ Util::Trace("CoComtypesDispRecordParamTest", msg, hr) ;}

///////////////////////////////////////////////////////////
//
Expand Down
2 changes: 1 addition & 1 deletion .../CppTestSrv/CoComtypesDispIfcParamTests.h → ...ppTestSrv/CoComtypesDispRecordParamTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

//
// CoComtypesDispIfcParamTests.cpp - Component
// CoComtypesDispRecordParamTest.cpp - Component
//

#include "Iface.h"
Expand Down
8 changes: 4 additions & 4 deletions source/CppTestSrv/MAKEFILE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ guids.obj : guids.c
server.obj : server.cpp cunknown.h cfactory.h iface.h
cl $(CPP_FLAGS) server.cpp

CoComtypesDispIfcParamTests.obj : CoComtypesDispIfcParamTests.cpp CoComtypesDispIfcParamTests.h iface.h \
registry.h CUnknown.h
cl $(CPP_FLAGS) CoComtypesDispIfcParamTests.cpp
CoComtypesDispRecordParamTest.obj : CoComtypesDispRecordParamTest.cpp \
CoComtypesDispRecordParamTest.h iface.h registry.h CUnknown.h
cl $(CPP_FLAGS) CoComtypesDispRecordParamTest.cpp

#
# Helper classes
Expand Down Expand Up @@ -75,7 +75,7 @@ outproc.obj : outproc.cpp CFactory.h CUnknown.h
#

SERVER_OBJS = Server.obj \
CoComtypesDispIfcParamTests.obj \
CoComtypesDispRecordParamTest.obj \
Registry.obj \
Cfactory.obj \
Cunknown.obj \
Expand Down
10 changes: 5 additions & 5 deletions source/CppTestSrv/SERVER.CPP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "CFactory.h"
#include "Iface.h"
#include "CoComtypesDispIfcParamTests.h"
#include "CoComtypesDispRecordParamTest.h"


///////////////////////////////////////////////////////////
Expand All @@ -35,10 +35,10 @@
//
CFactoryData g_FactoryDataArray[] =
{
{&CLSID_CoComtypesDispIfcParamTests, CA::CreateInstance,
L"Comtypes component for dispinterface parameter tests", // Friendly Name
L"Comtypes.DispIfcParamTests.1", // ProgID
L"Comtypes.DispIfcParamTests", // Version-independent ProgID
{&CLSID_CoComtypesDispRecordParamTest, CA::CreateInstance,
L"Comtypes component for dispinterface record parameter tests", // Friendly Name
L"Comtypes.DispRecordParamTest.1", // ProgID
L"Comtypes.DispRecordParamTest", // Version-independent ProgID
&LIBID_ComtypesCppTestSrvLib, // Type Library ID
NULL, 0}
} ;
Expand Down
10 changes: 5 additions & 5 deletions source/CppTestSrv/SERVER.IDL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ library ComtypesCppTestSrvLib
// TLib : OLE Automation : {00020430-0000-0000-C000-000000000046}
importlib("stdole2.tlb") ;

// CoComtypesDispIfcParamTests
// Component that implements interfaces used for dispinterface parameter tests.
// CoComtypesDispRecordParamTest
// Component that implements interfaces used for dispinterface record parameter tests.
[
uuid(06571915-2431-4CA3-9C01-53002B060DAB),
helpstring("Comtypes component for dispinterface parameter tests.")
uuid(5E78C9A8-4C19-4285-BCD6-3FFBBA5B17A8),
helpstring("Comtypes component for dispinterface record parameter tests.")
]
coclass CoComtypesDispIfcParamTests
coclass CoComtypesDispRecordParamTest
{
interface IDualRecordParamTest ;
dispinterface IDispRecordParamTest ;
Expand Down