Update of /cvsroot/com0com/com0com/setup
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16274
Modified Files:
devutils.cpp setup.cpp
Log Message:
Some defines moved to ../include/com0com.h
Changed name of device object (for WMI)
Index: setup.cpp
===================================================================
RCS file: /cvsroot/com0com/com0com/setup/setup.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.cpp 25 Aug 2006 10:36:48 -0000 1.2
--- setup.cpp 13 Oct 2006 10:26:35 -0000 1.3
***************
*** 20,23 ****
--- 20,27 ----
*
* $Log$
+ * Revision 1.3 2006/10/13 10:26:35 vfrolov
+ * Some defines moved to ../include/com0com.h
+ * Changed name of device object (for WMI)
+ *
* Revision 1.2 2006/08/25 10:36:48 vfrolov
* Added C0C_PREF_PORT_NAME_A and C0C_PREF_PORT_NAME_B defines
***************
*** 37,44 ****
#include "utils.h"
! #define C0C_BUS_DEVICE_ID "root\\com0com"
! #define C0C_PORT_DEVICE_ID "com0com\\port"
! #define C0C_PREF_PORT_NAME_A "CNCA"
! #define C0C_PREF_PORT_NAME_B "CNCB"
#define C0C_INF_NAME "com0com.inf"
--- 41,46 ----
#include "utils.h"
! #define TEXT_PREF
! #include "../include/com0com.h"
#define C0C_INF_NAME "com0com.inf"
***************
*** 46,50 ****
#define C0C_CLASS "CNCPorts"
#define C0C_PROVIDER "Vyacheslav Frolov"
- #define C0C_SERVICE "com0com"
#define C0C_REGKEY_EVENTLOG REGSTR_PATH_SERVICES "\\Eventlog\\System\\" C0C_SERVICE
#define C0C_COPY_DRIVERS_SECTION "com0com_CopyDrivers"
--- 48,51 ----
***************
*** 62,66 ****
char phPortName[20];
! SNPRINTF(phPortName, sizeof(phPortName), "%s%d", j ? C0C_PREF_PORT_NAME_B : C0C_PREF_PORT_NAME_A, i);
PortParameters portParameters(C0C_SERVICE, phPortName);
--- 63,68 ----
char phPortName[20];
! SNPRINTF(phPortName, sizeof(phPortName)/sizeof(phPortName[0]), "%s%d",
! j ? C0C_PREF_PORT_NAME_B : C0C_PREF_PORT_NAME_A, i);
PortParameters portParameters(C0C_SERVICE, phPortName);
***************
*** 70,74 ****
char buf[100];
! portParameters.FillParametersStr(buf, sizeof(buf));
Trace(" %s %s\n", phPortName, buf);
--- 72,76 ----
char buf[100];
! portParameters.FillParametersStr(buf, sizeof(buf)/sizeof(buf[0]));
Trace(" %s %s\n", phPortName, buf);
***************
*** 81,88 ****
if (err == ERROR_SUCCESS) {
! portParameters.FillParametersStr(buf, sizeof(buf));
Trace("change %s %s\n", phPortName, buf);
! RestartDevices(infFile, C0C_PORT_DEVICE_ID, phPortName, &rebootRequired);
} else {
ShowError(MB_OK|MB_ICONWARNING, err, "portParameters.Save(%s)", phPortName);
--- 83,95 ----
if (err == ERROR_SUCCESS) {
! portParameters.FillParametersStr(buf, sizeof(buf)/sizeof(buf[0]));
Trace("change %s %s\n", phPortName, buf);
! char phDevDevName[40];
!
! SNPRINTF(phDevDevName, sizeof(phDevDevName)/sizeof(phDevDevName[0]), "%s%d",
! j ? C0C_PREF_DEVICE_NAME_A : C0C_PREF_DEVICE_NAME_B, i);
!
! RestartDevices(infFile, C0C_PORT_DEVICE_ID, phDevDevName, &rebootRequired);
} else {
ShowError(MB_OK|MB_ICONWARNING, err, "portParameters.Save(%s)", phPortName);
***************
*** 142,146 ****
pParameters = j ? pParametersB : pParametersA;
! SNPRINTF(phPortName, sizeof(phPortName), "%s%d", j ? C0C_PREF_PORT_NAME_B : C0C_PREF_PORT_NAME_A, i);
PortParameters portParameters(C0C_SERVICE, phPortName);
--- 149,154 ----
pParameters = j ? pParametersB : pParametersA;
! SNPRINTF(phPortName, sizeof(phPortName)/sizeof(phPortName[0]), "%s%d",
! j ? C0C_PREF_PORT_NAME_B : C0C_PREF_PORT_NAME_A, i);
PortParameters portParameters(C0C_SERVICE, phPortName);
***************
*** 163,167 ****
char buf[100];
! portParameters.FillParametersStr(buf, sizeof(buf));
Trace(" %s %s\n", phPortName, buf);
--- 171,175 ----
char buf[100];
! portParameters.FillParametersStr(buf, sizeof(buf)/sizeof(buf[0]));
Trace(" %s %s\n", phPortName, buf);
Index: devutils.cpp
===================================================================
RCS file: /cvsroot/com0com/com0com/setup/devutils.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** devutils.cpp 28 Jul 2006 12:16:42 -0000 1.1
--- devutils.cpp 13 Oct 2006 10:26:35 -0000 1.2
***************
*** 20,23 ****
--- 20,27 ----
*
* $Log$
+ * Revision 1.2 2006/10/13 10:26:35 vfrolov
+ * Some defines moved to ../include/com0com.h
+ * Changed name of device object (for WMI)
+ *
* Revision 1.1 2006/07/28 12:16:42 vfrolov
* Initial revision
***************
*** 313,323 ****
BOOL *pRebootRequired)
{
- char phDevObjName[30];
-
- if (SNPRINTF(phDevObjName, sizeof(phDevObjName), "\\Device\\%s", pPhDevName) < 0)
- return FALSE;
-
- phDevObjName[sizeof(phDevObjName) - 1] = 0;
-
EnumParams enumParams;
--- 317,320 ----
***************
*** 326,330 ****
enumParams.pRebootRequired = pRebootRequired;
enumParams.pDevId = pDevId;
! enumParams.pPhObjName = phDevObjName;
do {
--- 323,327 ----
enumParams.pRebootRequired = pRebootRequired;
enumParams.pDevId = pDevId;
! enumParams.pPhObjName = pPhDevName;
do {
|
