Skip to content

Commit

Permalink
Changed the name of the component that implements the interface for (e…
Browse files Browse the repository at this point in the history
  • Loading branch information
geppi authored Jun 24, 2024
1 parent e338dc5 commit a6aa153
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion comtypes/test/test_dispifc_records.py
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
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
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
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
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
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

0 comments on commit a6aa153

Please sign in to comment.