Menu
▾
▴
bdadev-cvs — cvs commits to the project
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(49) |
Mar
(6) |
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
|---|
|
From: <ad...@us...> - 2003-02-17 17:08:11
|
Update of /cvsroot/bdadev/TuneReqStore
In directory sc8-pr-cvs1:/tmp/cvs-serv9897
Modified Files:
TuneReqStore.h TuneRequestStore.cpp
Log Message:
Fix String bugs
Index: TuneReqStore.h
===================================================================
RCS file: /cvsroot/bdadev/TuneReqStore/TuneReqStore.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TuneReqStore.h 17 Feb 2003 16:57:41 -0000 1.1.1.1
--- TuneReqStore.h 17 Feb 2003 17:08:07 -0000 1.2
***************
*** 3,7 ****
/* File created by MIDL compiler version 5.01.0164 */
! /* at Mon Feb 17 16:46:53 2003
*/
/* Compiler settings for C:\Source\Bdadev\TuneReqStore\TuneReqStore.idl:
--- 3,7 ----
/* File created by MIDL compiler version 5.01.0164 */
! /* at Mon Feb 17 17:02:57 2003
*/
/* Compiler settings for C:\Source\Bdadev\TuneReqStore\TuneReqStore.idl:
Index: TuneRequestStore.cpp
===================================================================
RCS file: /cvsroot/bdadev/TuneReqStore/TuneRequestStore.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TuneRequestStore.cpp 17 Feb 2003 16:57:42 -0000 1.1.1.1
--- TuneRequestStore.cpp 17 Feb 2003 17:08:07 -0000 1.2
***************
*** 444,448 ****
else
{
! wprintf(escape, L"_%x", (unsigned int)pString[i]);
strOut.append(escape);
bEscaped = true;
--- 444,448 ----
else
{
! swprintf(escape, L"_%x", (unsigned int)pString[i]);
strOut.append(escape);
bEscaped = true;
***************
*** 580,584 ****
{
static wchar_t ObjectName[20];
! wprintf(ObjectName, "Channel%d", ChannelIndex + 1);
return ObjectName;
}
--- 580,584 ----
{
static wchar_t ObjectName[20];
! swprintf(ObjectName, L"Channel%d", ChannelIndex + 1);
return ObjectName;
}
|
|
From: <ad...@us...> - 2003-02-17 17:02:47
|
Update of /cvsroot/bdadev/TuneReqStore In directory sc8-pr-cvs1:/tmp/cvs-serv6762 Modified Files: .cvsignore Log Message: Fixed Screwed up import Index: .cvsignore =================================================================== RCS file: /cvsroot/bdadev/TuneReqStore/.cvsignore,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** .cvsignore 17 Feb 2003 16:57:40 -0000 1.1.1.1 --- .cvsignore 17 Feb 2003 17:02:44 -0000 1.2 *************** *** 3,13 **** dlldata.c msxml.tlh ! TunReqStore.aps ! TunReqStore.ncb ! TunReqStore.opt ! TunReqStore.plg ! TunReqStore.tlb ! TunReqStore_i.c ! TunReqStore_p.c ! TunReqStoreps.def ! TunReqStoreps.mk --- 3,13 ---- dlldata.c msxml.tlh ! TuneReqStore.aps ! TuneReqStore.ncb ! TuneReqStore.opt ! TuneReqStore.plg ! TuneReqStore.tlb ! TuneReqStore_i.c ! TuneReqStore_p.c ! TuneReqStoreps.def ! TuneReqStoreps.mk |
|
From: <ad...@us...> - 2003-02-17 17:02:28
|
Update of /cvsroot/bdadev/TuneReqStore In directory sc8-pr-cvs1:/tmp/cvs-serv6449 Removed Files: TuneReqStore.aps TuneReqStore.ncb TuneReqStore.opt TuneReqStore.plg TuneReqStore.tlb TuneReqStore_i.c TuneReqStore_p.c TuneReqStoreps.def TuneReqStoreps.mk Log Message: Fixed Screwed up import --- TuneReqStore.aps DELETED --- --- TuneReqStore.ncb DELETED --- --- TuneReqStore.opt DELETED --- --- TuneReqStore.plg DELETED --- --- TuneReqStore.tlb DELETED --- --- TuneReqStore_i.c DELETED --- --- TuneReqStore_p.c DELETED --- --- TuneReqStoreps.def DELETED --- --- TuneReqStoreps.mk DELETED --- |
|
From: <ad...@us...> - 2003-02-17 11:08:39
|
Update of /cvsroot/bdadev/NovaTDriver In directory sc8-pr-cvs1:/tmp/cvs-serv3833 Modified Files: .cvsignore Log Message: Added VS6 project generated files Index: .cvsignore =================================================================== RCS file: /cvsroot/bdadev/NovaTDriver/.cvsignore,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** .cvsignore 14 Feb 2003 19:13:40 -0000 1.1.1.1 --- .cvsignore 17 Feb 2003 11:08:34 -0000 1.2 *************** *** 5,6 **** --- 5,9 ---- buildchk.log HNTbda.aps + NovaTDriver.plg + NovaTDriver.ncb + NovaTDriver.opt |
Update of /cvsroot/bdadev/NovaTDriver
In directory sc8-pr-cvs1:/tmp/cvs-serv3303
Modified Files:
automation.cpp automation.h debug.cpp debug.h device.cpp
device.h driver.cpp driver.h l64781.cpp l64781.h resource.h
saa7146.cpp saa7146.h tuner.cpp tuner.h
Added Files:
NovaTDriver.dsp NovaTDriver.dsw
Log Message:
Added VS6 project for the lazy
--- NEW FILE: NovaTDriver.dsp ---
# Microsoft Developer Studio Project File - Name="NovaTDriver" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=NovaTDriver - Win32 Checked
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "NovaTDriver.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "NovaTDriver.mak" CFG="NovaTDriver - Win32 Checked"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "NovaTDriver - Win32 Free" (based on "Win32 (x86) Application")
!MESSAGE "NovaTDriver - Win32 Checked" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "NovaTDriver - Win32 Free"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "objfre\i386"
# PROP BASE Intermediate_Dir "objfre\i386"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "objfre\i386"
# PROP Intermediate_Dir "objfre\i386"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /Gz /W3 /WX /O2 /I "$(ddkpath)\inc\wxp" /I "$(ddkpath)\inc\ddk\wxp" /I "$(ddkpath)\inc\ddk\wdm\wxp" /I "$(ddkpath)\inc\crt" /FI"$(ddkpath)\inc\wxp\warning.h" /D CONDITION_HANDLING=1 /D DBG=0 /D DEVL=1 /D "DRIVER" /D FPO=1 /D "NDEBUG" /D NT_INST=0 /D NT_UP=1 /D "STD_CALL" /D "WIN32" /D WIN32=100 /D WIN32_LEAN_AND_MEAN=1 /D WINNT=1 /D WINVER=0x0501 /D _DLL=1 /D "_IDWBUILD" /D "_MBCS" /D _NT1X_=100 /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "_WINDOWS" /D _X86_=1 /D i386=1 /FR /YX /FD -GF -Oxs -QI0f -QIf -QIfdiv- -Zel -Zvc6 -cbstring /c
# ADD CPP /nologo /G6 /Gz /W3 /WX /O2 /I "$(ddkpath)\inc\wxp" /I "$(ddkpath)\inc\ddk\wxp" /I "$(ddkpath)\inc\wdm\wxp" /I "$(ddkpath)\inc\crt" /FI"$(ddkpath)\inc\wxp\warning.h" /D CONDITION_HANDLING=1 /D DBG=0 /D DEVL=1 /D "DRIVER" /D FPO=1 /D "NDEBUG" /D NT_INST=0 /D NT_UP=1 /D "STD_CALL" /D "WIN32" /D WIN32=100 /D WIN32_LEAN_AND_MEAN=1 /D WINNT=1 /D WINVER=0x0501 /D _DLL=1 /D "_IDWBUILD" /D "_MBCS" /D _NT1X_=100 /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "_WINDOWS" /D _X86_=1 /D i386=1 /FR /YX /FD -GF -Oxs -QI0f -QIf -QIfdiv- -Zel -Zvc6 -cbstring /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /i "$(ddkpath)\inc\wxp" /i "$(ddkpath)\inc\ddk\wxp" /i "$(ddkpath)\inc\ddk\wdm\wxp" /i "$(ddkpath)\inc\crt" /d "NDEBUG"
# ADD RSC /l 0x409 /i "$(ddkpath)\inc\wxp" /i "$(ddkpath)\inc\ddk\wxp" /i "$(ddkpath)\inc\ddk\wdm\wxp" /i "$(ddkpath)\inc\crt" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wdm.lib wmilib.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /machine:IX86 /nodefaultlib /out:"objfre\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
# ADD LINK32 wdm.lib wmilib.lib ks.lib ksguid.lib BdaSup.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /machine:IX86 /nodefaultlib /out:"objfre\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
# Begin Custom Build - Finishing up...
TargetPath=.\objfre\i386\NovaTDriver.sys
InputPath=.\objfre\i386\NovaTDriver.sys
SOURCE="$(InputPath)"
"objfre\i386\NovaTDriver.sys" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
rebase -b 10000 -x junk $(TargetPath)
# End Custom Build
!ELSEIF "$(CFG)" == "NovaTDriver - Win32 Checked"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "objchk\i386"
# PROP BASE Intermediate_Dir "objchk\i386"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "objchk\i386"
# PROP Intermediate_Dir "objchk\i386"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /Gz /W3 /WX /Z7 /Oi /Gy /I "$(ddkpath)\inc\wxp" /I "$(ddkpath)\inc\ddk\wxp" /I "$(ddkpath)\inc\ddk\wdm\wxp" /I "$(ddkpath)\inc\crt" /FI"$(ddkpath)\inc\wxp\warning.h" /D CONDITION_HANDLING=1 /D DBG=1 /D DEVL=1 /D "DRIVER" /D FPO=0 /D "NDEBUG" /D NT_INST=0 /D NT_UP=1 /D "RDRDBG" /D "SRVDBG" /D "STD_CALL" /D "WIN32" /D WIN32=100 /D WIN32_LEAN_AND_MEAN=1 /D WINNT=1 /D WINVER=0x0501 /D "_DEBUG" /D _DLL=1 /D "_IDWBUILD" /D "_MBCS" /D _NT1X_=100 /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "_WINDOWS" /D _X86_=1 /D i386=1 /FR /YX /FD -GF -QI0f -QIf -QIfdiv- -Zel -Zvc6 -cbstring /c
# ADD CPP /nologo /G6 /Gz /W3 /WX /Z7 /Oi /Gy /I "$(ddkpath)\inc\wxp" /I "$(ddkpath)\inc\ddk\wxp" /I "$(ddkpath)\inc\wdm\wxp" /I "$(ddkpath)\inc\crt" /FI"$(ddkpath)\inc\wxp\warning.h" /D CONDITION_HANDLING=1 /D DBG=1 /D DEVL=1 /D "DRIVER" /D FPO=0 /D "NDEBUG" /D NT_INST=0 /D NT_UP=1 /D "RDRDBG" /D "SRVDBG" /D "STD_CALL" /D "WIN32" /D WIN32=100 /D WIN32_LEAN_AND_MEAN=1 /D WINNT=1 /D WINVER=0x0501 /D "_DEBUG" /D _DLL=1 /D "_IDWBUILD" /D "_MBCS" /D _NT1X_=100 /D _WIN32_IE=0x0600 /D _WIN32_WINNT=0x0501 /D "_WINDOWS" /D _X86_=1 /D i386=1 /D "_SYS_GUID_OPERATOR_EQ_" /FR /YX /FD -GF -QI0f -QIf -QIfdiv- -Zel -Zvc6 -cbstring /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /i "$(ddkpath)\inc\wxp" /i "$(ddkpath)\inc\ddk\wxp" /i "$(ddkpath)\inc\ddk\wdm\wxp" /i "$(ddkpath)\inc\crt" /d "_DEBUG"
# ADD RSC /l 0x409 /i "$(ddkpath)\inc\wxp" /i "$(ddkpath)\inc\ddk\wxp" /i "$(ddkpath)\inc\ddk\wdm\wxp" /i "$(ddkpath)\inc\crt" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wdm.lib wmilib.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /incremental:no /machine:IX86 /nodefaultlib /out:"objchk\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
# ADD LINK32 wdm.lib wmilib.lib ks.lib ksguid.lib BdaSup.lib ntoskrnl.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /incremental:no /machine:IX86 /nodefaultlib /out:"objchk\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
# Begin Custom Build - Finishing up...
TargetPath=.\objchk\i386\NovaTDriver.sys
InputPath=.\objchk\i386\NovaTDriver.sys
SOURCE="$(InputPath)"
"$(WINDIR)\system32\drivers\NovaTDriver.sys" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(TargetPath) $(WINDIR)\system32\drivers
# End Custom Build
!ENDIF
# Begin Target
# Name "NovaTDriver - Win32 Free"
# Name "NovaTDriver - Win32 Checked"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\automation.cpp
# End Source File
# Begin Source File
SOURCE=.\debug.cpp
# End Source File
# Begin Source File
SOURCE=.\device.cpp
# End Source File
# Begin Source File
SOURCE=.\driver.cpp
# End Source File
# Begin Source File
SOURCE=.\HNTbda.rc
# End Source File
# Begin Source File
SOURCE=.\l64781.cpp
# End Source File
# Begin Source File
SOURCE=.\saa7146.cpp
# End Source File
# Begin Source File
SOURCE=.\tuner.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\automation.h
# End Source File
# Begin Source File
SOURCE=.\Debug.h
# End Source File
# Begin Source File
SOURCE=.\device.h
# End Source File
# Begin Source File
SOURCE=.\driver.h
# End Source File
# Begin Source File
SOURCE=.\l64781.h
# End Source File
# Begin Source File
SOURCE=.\resource.h
# End Source File
# Begin Source File
SOURCE=.\saa7146.h
# End Source File
# Begin Source File
SOURCE=.\Tuner.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
--- NEW FILE: NovaTDriver.dsw ---
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "NovaTDriver"=.\NovaTDriver.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################
Index: automation.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/automation.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** automation.cpp 14 Feb 2003 19:13:39 -0000 1.1.1.1
--- automation.cpp 17 Feb 2003 11:07:11 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
/*****************************************************************************\
* Hauppauge Nova-T BDA driver *
***************
*** 313,314 ****
--- 314,322 ----
return status;
}
+
+ /*****************************************************************************\
+ * $Log$
+ * Revision 1.2 2003/02/17 11:07:11 adcockj
+ * Added VS6 project for the lazy
+ *
+ \*****************************************************************************/
Index: automation.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/automation.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** automation.h 14 Feb 2003 19:13:35 -0000 1.1.1.1
--- automation.h 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
#ifndef __AUTOMATION_H__
#define __AUTOMATION_H__
Index: debug.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/debug.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** debug.cpp 14 Feb 2003 19:13:39 -0000 1.1.1.1
--- debug.cpp 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
/*****************************************************************************\
* Hauppauge Nova-T BDA driver *
***************
*** 86,87 ****
--- 87,95 ----
}
}
+
+ /*****************************************************************************\
+ * $Log$
+ * Revision 1.2 2003/02/17 11:07:12 adcockj
+ * Added VS6 project for the lazy
+ *
+ \*****************************************************************************/
Index: debug.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/debug.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** debug.h 14 Feb 2003 19:13:39 -0000 1.1.1.1
--- debug.h 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
#ifndef __DEBUG_H__
#define __DEBUG_H__
Index: device.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/device.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** device.cpp 14 Feb 2003 19:13:39 -0000 1.1.1.1
--- device.cpp 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
/*****************************************************************************\
* Hauppauge Nova-T BDA driver *
***************
*** 257,258 ****
--- 258,266 ----
return STATUS_SUCCESS;
}
+
+ /*****************************************************************************\
+ * $Log$
+ * Revision 1.2 2003/02/17 11:07:12 adcockj
+ * Added VS6 project for the lazy
+ *
+ \*****************************************************************************/
Index: device.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/device.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** device.h 14 Feb 2003 19:13:38 -0000 1.1.1.1
--- device.h 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
#ifndef __DEVICE_H__
#define __DEVICE_H__
Index: driver.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/driver.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** driver.cpp 14 Feb 2003 19:13:38 -0000 1.1.1.1
--- driver.cpp 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
/*****************************************************************************\
* Hauppauge Nova-T BDA driver *
***************
*** 504,505 ****
--- 505,513 ----
return KsInitializeDriver(DriverObject,RegistryPath,&DeviceDescriptor);
}
+
+ /*****************************************************************************\
+ * $Log$
+ * Revision 1.2 2003/02/17 11:07:12 adcockj
+ * Added VS6 project for the lazy
+ *
+ \*****************************************************************************/
Index: driver.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/driver.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** driver.h 14 Feb 2003 19:13:35 -0000 1.1.1.1
--- driver.h 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
#ifndef __DRIVER_H__
#define __DRIVER_H__
Index: l64781.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/l64781.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** l64781.cpp 14 Feb 2003 19:13:38 -0000 1.1.1.1
--- l64781.cpp 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
/*****************************************************************************\
* Hauppauge Nova-T BDA driver *
***************
*** 313,314 ****
--- 314,322 ----
DbgPrint("Nova-T: L64781 updated\n");
}
+
+ /*****************************************************************************\
+ * $Log$
+ * Revision 1.2 2003/02/17 11:07:12 adcockj
+ * Added VS6 project for the lazy
+ *
+ \*****************************************************************************/
Index: l64781.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/l64781.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** l64781.h 14 Feb 2003 19:13:37 -0000 1.1.1.1
--- l64781.h 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
#ifndef __L64781_H__
#define __L64781_H__
Index: resource.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/resource.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** resource.h 14 Feb 2003 19:13:35 -0000 1.1.1.1
--- resource.h 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
Index: saa7146.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/saa7146.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** saa7146.cpp 14 Feb 2003 19:13:37 -0000 1.1.1.1
--- saa7146.cpp 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
/*****************************************************************************\
* Hauppauge Nova-T BDA driver *
***************
*** 362,363 ****
--- 363,371 ----
DeviceWriteRegister32(device,REG_GPIO_CTRL,val);
}
+
+ /*****************************************************************************\
+ * $Log$
+ * Revision 1.2 2003/02/17 11:07:12 adcockj
+ * Added VS6 project for the lazy
+ *
+ \*****************************************************************************/
Index: saa7146.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/saa7146.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** saa7146.h 14 Feb 2003 19:13:37 -0000 1.1.1.1
--- saa7146.h 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
#ifndef __SAA7146_H__
#define __SAA7146_H__
Index: tuner.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/tuner.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tuner.cpp 14 Feb 2003 19:13:36 -0000 1.1.1.1
--- tuner.cpp 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
/*****************************************************************************\
* Hauppauge Nova-T BDA driver *
***************
*** 112,113 ****
--- 113,121 ----
DbgPrint("Nova-T: Tuner set\n");
}
+
+ /*****************************************************************************\
+ * $Log$
+ * Revision 1.2 2003/02/17 11:07:12 adcockj
+ * Added VS6 project for the lazy
+ *
+ \*****************************************************************************/
\ No newline at end of file
Index: tuner.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/tuner.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tuner.h 14 Feb 2003 19:13:36 -0000 1.1.1.1
--- tuner.h 17 Feb 2003 11:07:12 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ // $Id$
#ifndef __TUNER_H__
#define __TUNER_H__
|
|
From: <ad...@us...> - 2003-02-14 16:01:46
|
Update of /cvsroot/bdadev/CleverTelly
In directory sc8-pr-cvs1:/tmp/cvs-serv26738
Added Files:
DebugLog.cpp DebugLog.h cleverte.ico
Log Message:
Added in missed files
--- NEW FILE: DebugLog.cpp ---
/////////////////////////////////////////////////////////////////////////////
// $Id: DebugLog.cpp,v 1.1 2003/02/14 16:01:37 adcockj Exp $
/////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2003 John Adcock. All rights reserved.
/////////////////////////////////////////////////////////////////////////////
//
// This file is subject to the terms of the GNU General Public License as
// published by the Free Software Foundation. A copy of this license is
// included with this software distribution in the file COPYING. If you
// do not have a copy, you may obtain a copy by writing to the Free
// Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
//
// This software is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details
/////////////////////////////////////////////////////////////////////////////
// This was is a modified version of DebugLog.cpp v 1.21
// from the DScaler project
//////////////////////////////////////////////////////////////////////////////
#include "StdAfx.h"
#include "resource.h"
#include "DebugLog.h"
#include <sys/timeb.h>
#include <time.h>
#define DEBUGLOGFILENAME "CleverTelly.log"
static FILE* debugLog = NULL;
#ifdef _DEBUG
static long DebugLogLevel = 2;
#else
static long DebugLogLevel = 1;
#endif
void LOG(int DebugLevel, LPCSTR Format, ...)
{
DWORD SysTime;
struct _timeb TimeB;
struct tm* Time;
char Stamp[100];
va_list Args;
// allow file to be closed at the end
if(Format == NULL)
{
if (debugLog != NULL)
{
fclose(debugLog);
debugLog = NULL;
}
return;
}
if (DebugLevel > DebugLogLevel)
{
return;
}
if (debugLog == NULL)
{
debugLog = fopen(DEBUGLOGFILENAME, "w");
}
if (debugLog == NULL)
{
return;
}
SysTime = timeGetTime();
_ftime(&TimeB);
Time = localtime(&TimeB.time);
strftime(Stamp, sizeof(Stamp), "%y%m%d %H%M%S", Time);
fprintf(debugLog, "%s.%03d(%03d)", Stamp, TimeB.millitm, SysTime % 1000);
for(int i(0); i < DebugLevel + 1; ++i)
{
fputc(' ', debugLog);
}
va_start(Args, Format);
vfprintf(debugLog, Format, Args);
va_end(Args);
fputc('\n', debugLog);
}
/////////////////////////////////////////////////////////////////////////////
// CVS Log
//
// $Log: DebugLog.cpp,v $
// Revision 1.1 2003/02/14 16:01:37 adcockj
// Added in missed files
//
/////////////////////////////////////////////////////////////////////////////
--- NEW FILE: DebugLog.h ---
/////////////////////////////////////////////////////////////////////////////
// $Id: DebugLog.h,v 1.1 2003/02/14 16:01:37 adcockj Exp $
/////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2003 John Adcock. All rights reserved.
/////////////////////////////////////////////////////////////////////////////
//
// This file is subject to the terms of the GNU General Public License as
// published by the Free Software Foundation. A copy of this license is
// included with this software distribution in the file COPYING. If you
// do not have a copy, you may obtain a copy by writing to the Free
// Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
//
// This software is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details
/////////////////////////////////////////////////////////////////////////////
#pragma once
void LOG(int DebugLevel, LPCSTR format, ...);
--- NEW FILE: cleverte.ico ---
(This appears to be a binary file; contents omitted.)
|
|
From: <ad...@us...> - 2003-02-13 17:26:54
|
Update of /cvsroot/bdadev/CleverTelly
In directory sc8-pr-cvs1:/tmp/cvs-serv13221
Modified Files:
CleverTelly.cpp CleverTelly.dsp CleverTelly.rc
MSVidCtlComp.cpp StdAfx.h resource.h
Log Message:
Interim Checkin starting to add some basic functionality
Index: CleverTelly.cpp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CleverTelly.cpp 13 Feb 2003 10:50:17 -0000 1.2
--- CleverTelly.cpp 13 Feb 2003 17:26:44 -0000 1.3
***************
*** 47,50 ****
--- 47,73 ----
return NULL;
}
+ void CreateNewClass()
+ {
+ WNDCLASSEX wc;
+
+ EnterCriticalSection(&_Module.m_csWindowCreate);
+ wc.cbSize = sizeof(WNDCLASSEX);
+ wc.style = 0;
+
+ wc.lpfnWndProc = AtlAxWindowProc;
+ wc.cbClsExtra = 0;
+ wc.cbWndExtra = 0;
+ wc.hInstance = _Module.GetModuleInstance();
+ wc.hIcon = LoadIcon(_Module.m_hInstResource, MAKEINTRESOURCE(IDI_CLEVERTELLY));
+ wc.hCursor = ::LoadCursor(NULL, IDC_ARROW);
+ wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+ wc.lpszMenuName = NULL;
+ wc.lpszClassName = CAxWindow::GetWndClassName();
+ wc.hIconSm = LoadIcon(_Module.m_hInstResource, MAKEINTRESOURCE(IDI_CLEVERTELLY));
+
+ ::RegisterClassEx(&wc);
+
+ LeaveCriticalSection(&_Module.m_csWindowCreate);
+ }
/////////////////////////////////////////////////////////////////////////////
***************
*** 102,110 ****
_ASSERTE(SUCCEEDED(hRes));
AtlAxWinInit();
HWND hWnd = ::CreateWindow(
TEXT("AtlAxWin"),
TEXT("CleverTelly.MSVidCtlComp"),
! NULL,
CW_USEDEFAULT,
CW_USEDEFAULT,
--- 125,135 ----
_ASSERTE(SUCCEEDED(hRes));
+ CreateNewClass();
AtlAxWinInit();
+
HWND hWnd = ::CreateWindow(
TEXT("AtlAxWin"),
TEXT("CleverTelly.MSVidCtlComp"),
! WS_POPUP,
CW_USEDEFAULT,
CW_USEDEFAULT,
***************
*** 117,120 ****
--- 142,148 ----
);
+ ::SetWindowText(hWnd, TEXT("CleverTelly"));
+ ::ShowWindow(hWnd, SW_SHOW);
+
MSG msg;
while (GetMessage(&msg, 0, 0, 0))
***************
*** 129,132 ****
--- 157,164 ----
_Module.Term();
+
+ // close the log file
+ LOG(0, NULL);
+
CoUninitialize();
return nRet;
***************
*** 137,140 ****
--- 169,175 ----
//
// $Log$
+ // Revision 1.3 2003/02/13 17:26:44 adcockj
+ // Interim Checkin starting to add some basic functionality
+ //
// Revision 1.2 2003/02/13 10:50:17 adcockj
// Split out Module stuff and tidy up auto generated ATL code
Index: CleverTelly.dsp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.dsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CleverTelly.dsp 13 Feb 2003 10:19:07 -0000 1.1.1.1
--- CleverTelly.dsp 13 Feb 2003 17:26:44 -0000 1.2
***************
*** 53,57 ****
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Strmiids.lib /nologo /subsystem:windows /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Strmiids.lib /nologo /subsystem:windows /machine:I386
# Begin Custom Build - Performing registration
OutDir=.\Release
--- 53,57 ----
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Strmiids.lib /nologo /subsystem:windows /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Strmiids.lib winmm.lib /nologo /subsystem:windows /machine:I386
# Begin Custom Build - Performing registration
OutDir=.\Release
***************
*** 88,92 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
--- 88,92 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
***************
*** 96,100 ****
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Strmiids.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Strmiids.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /pdbtype:sept
# Begin Custom Build - Performing registration
OutDir=.\Debug
--- 96,100 ----
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Strmiids.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Strmiids.lib winmm.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /pdbtype:sept
# Begin Custom Build - Performing registration
OutDir=.\Debug
***************
*** 141,144 ****
--- 141,152 ----
# Begin Source File
+ SOURCE=.\DebugLog.cpp
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\Module.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\MSVidCtlComp.cpp
# End Source File
***************
*** 155,158 ****
--- 163,174 ----
# Begin Source File
+ SOURCE=.\DebugLog.h
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\Module.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\MSVidCtlComp.h
# End Source File
***************
*** 171,175 ****
--- 187,199 ----
# Begin Source File
+ SOURCE=.\cleverte.ico
+ # End Source File
+ # Begin Source File
+
SOURCE=.\CleverTelly.rgs
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\msvidctl.bmp
# End Source File
# Begin Source File
Index: CleverTelly.rc
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.rc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CleverTelly.rc 13 Feb 2003 10:19:07 -0000 1.1.1.1
--- CleverTelly.rc 13 Feb 2003 17:26:45 -0000 1.2
***************
*** 135,139 ****
IDB_MSVIDCTLCOMP BITMAP DISCARDABLE "msvidctl.bmp"
-
/////////////////////////////////////////////////////////////////////////////
//
--- 135,138 ----
***************
*** 141,151 ****
//
! IDD_MSVIDCTLCOMP DIALOGEX 0, 0, 400, 300
! STYLE DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_THICKFRAME
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "",IDC_MSVIDCTL1,"{B0EDF163-910A-11D2-B632-00C04F79498E}",
! WS_TABSTOP,0,0,399,300
CONTROL "",IDC_MSVIDCTL2,"{B0EDF163-910A-11D2-B632-00C04F79498E}",
NOT WS_VISIBLE | WS_TABSTOP,13,12,128,118
--- 140,152 ----
//
! IDD_MSVIDCTLCOMP DIALOGEX 0, 0, 239, 206
! STYLE DS_3DLOOK | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE | WS_CAPTION |
! WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_CONTROLPARENT
+ CAPTION "CleverTelly"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "",IDC_MSVIDCTL1,"{B0EDF163-910A-11D2-B632-00C04F79498E}",
! WS_TABSTOP,0,0,238,206
CONTROL "",IDC_MSVIDCTL2,"{B0EDF163-910A-11D2-B632-00C04F79498E}",
NOT WS_VISIBLE | WS_TABSTOP,13,12,128,118
***************
*** 169,172 ****
--- 170,182 ----
END
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Icon
+ //
+
+ // Icon with lowest ID value placed first to ensure application icon
+ // remains consistent on all systems.
+ IDI_CLEVERTELLY ICON DISCARDABLE "cleverte.ico"
#endif // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////
Index: MSVidCtlComp.cpp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/MSVidCtlComp.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MSVidCtlComp.cpp 13 Feb 2003 13:42:12 -0000 1.2
--- MSVidCtlComp.cpp 13 Feb 2003 17:26:46 -0000 1.3
***************
*** 60,63 ****
--- 60,66 ----
HRESULT hr = S_OK;
+ SetIcon(LoadIcon(_Module.m_hInstResource, MAKEINTRESOURCE(IDI_CLEVERTELLY)));
+ SetIcon(LoadIcon(_Module.m_hInstResource, MAKEINTRESOURCE(IDI_CLEVERTELLY)), FALSE);
+
hr = GetDlgControl(IDC_MSVIDCTL1, __uuidof(IMSVidCtl), reinterpret_cast<void **>(&m_pVidControl));
***************
*** 71,79 ****
void CMSVidCtlComp::ResizeVideoControl()
{
! CWindow VidCtlWnd(GetDlgItem(IDC_MSVIDCTL1));
! RECT rcWindow;
! GetWindowRect(&rcWindow);
! ScreenToClient(&rcWindow);
! VidCtlWnd.MoveWindow(&rcWindow);
}
--- 74,85 ----
void CMSVidCtlComp::ResizeVideoControl()
{
! CComQIPtr<IOleInPlaceObject> pInPlaceObject(m_pVidControl);
! if(pInPlaceObject != NULL)
! {
! RECT WinRect;
! GetWindowRect(&WinRect);
! ScreenToClient(&WinRect);
! pInPlaceObject->SetObjectRects(&WinRect, &WinRect);
! }
}
***************
*** 102,108 ****
{
// always do default processing
! bHandled = FALSE;
! ResizeVideoControl();
return 0;
--- 108,130 ----
{
// always do default processing
! bHandled = TRUE;
! switch(wParam)
! {
! case SIZE_MAXIMIZED:
! ResizeVideoControl();
! ShowWindow(SW_SHOW);
! break;
! case SIZE_MINIMIZED:
! CloseWindow(m_hWnd);
! break;
! case SIZE_RESTORED:
! ShowWindow(SW_SHOW);
! ResizeVideoControl();
! break;
! default:
! ResizeVideoControl();
! break;
! }
return 0;
***************
*** 238,241 ****
--- 260,266 ----
//
// $Log$
+ // Revision 1.3 2003/02/13 17:26:46 adcockj
+ // Interim Checkin starting to add some basic functionality
+ //
// Revision 1.2 2003/02/13 13:42:12 adcockj
// Added Event listeners
Index: StdAfx.h
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/StdAfx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StdAfx.h 13 Feb 2003 10:50:17 -0000 1.2
--- StdAfx.h 13 Feb 2003 17:26:46 -0000 1.3
***************
*** 37,40 ****
--- 37,41 ----
#include <atlctl.h>
+ #include "DebugLog.h"
//{{AFX_INSERT_LOCATION}}
Index: resource.h
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/resource.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** resource.h 13 Feb 2003 10:19:08 -0000 1.1.1.1
--- resource.h 13 Feb 2003 17:26:46 -0000 1.2
***************
*** 9,12 ****
--- 9,13 ----
#define IDD_MSVIDCTLCOMP 103
#define IDC_MSVIDCTL1 202
+ #define IDI_CLEVERTELLY 202
#define IDC_MSVIDCTL2 203
***************
*** 15,19 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 202
#define _APS_NEXT_COMMAND_VALUE 32768
#define _APS_NEXT_CONTROL_VALUE 204
--- 16,20 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 203
#define _APS_NEXT_COMMAND_VALUE 32768
#define _APS_NEXT_CONTROL_VALUE 204
|
|
From: <ad...@us...> - 2003-02-13 13:42:18
|
Update of /cvsroot/bdadev/CleverTelly
In directory sc8-pr-cvs1:/tmp/cvs-serv23843
Modified Files:
MSVidCtlComp.cpp MSVidCtlComp.h
Log Message:
Added Event listeners
Index: MSVidCtlComp.cpp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/MSVidCtlComp.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MSVidCtlComp.cpp 13 Feb 2003 10:19:08 -0000 1.1.1.1
--- MSVidCtlComp.cpp 13 Feb 2003 13:42:12 -0000 1.2
***************
*** 23,29 ****
--- 23,59 ----
#include "MSVidCtlComp.h"
+
+ _ATL_FUNC_INFO OnClickInfo = {CC_STDCALL, VT_EMPTY, 0};
+ _ATL_FUNC_INFO OnDblClickInfo = {CC_STDCALL, VT_EMPTY, 0};
+ _ATL_FUNC_INFO OnError = {CC_STDCALL, VT_EMPTY, 7, {VT_I2, VT_PTR, VT_I4, VT_BSTR, VT_BSTR, VT_I4, VT_PTR} };
+ _ATL_FUNC_INFO OnKeyDown = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR, VT_I2} };
+ _ATL_FUNC_INFO OnKeyPress = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR} };
+ _ATL_FUNC_INFO OnKeyUp = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR, VT_I2} };
+ _ATL_FUNC_INFO OnMouseDown = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
+ _ATL_FUNC_INFO OnMouseMove = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
+ _ATL_FUNC_INFO OnMouseUp = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
+ _ATL_FUNC_INFO OnStateChangeInfo = {CC_STDCALL, VT_EMPTY, 2, { VT_I4, VT_I4} };
+
+
/////////////////////////////////////////////////////////////////////////////
// CMSVidCtlComp
+ CMSVidCtlComp::CMSVidCtlComp()
+ {
+ m_bWindowOnly = TRUE;
+ CalcExtent(m_sizeExtent);
+ }
+
+ STDMETHODIMP CMSVidCtlComp::OnAmbientPropertyChange(DISPID dispid)
+ {
+ if (dispid == DISPID_AMBIENT_BACKCOLOR)
+ {
+ SetBackgroundColorFromAmbient();
+ FireViewChange();
+ }
+ return IOleControlImpl<CMSVidCtlComp>::OnAmbientPropertyChange(dispid);
+ }
+
+
LRESULT CMSVidCtlComp::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
***************
*** 33,40 ****
hr = GetDlgControl(IDC_MSVIDCTL2, __uuidof(IMSVidCtl), reinterpret_cast<void **>(&m_pVidControl2));
!
return hr;
}
LRESULT CMSVidCtlComp::OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
--- 63,82 ----
hr = GetDlgControl(IDC_MSVIDCTL2, __uuidof(IMSVidCtl), reinterpret_cast<void **>(&m_pVidControl2));
!
! ResizeVideoControl();
!
return hr;
}
+ void CMSVidCtlComp::ResizeVideoControl()
+ {
+ CWindow VidCtlWnd(GetDlgItem(IDC_MSVIDCTL1));
+ RECT rcWindow;
+ GetWindowRect(&rcWindow);
+ ScreenToClient(&rcWindow);
+ VidCtlWnd.MoveWindow(&rcWindow);
+ }
+
+
LRESULT CMSVidCtlComp::OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
***************
*** 49,52 ****
--- 91,111 ----
}
+ LRESULT CMSVidCtlComp::OnMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+ {
+ // always do default processing
+ bHandled = FALSE;
+
+ return 0;
+ }
+
+ LRESULT CMSVidCtlComp::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+ {
+ // always do default processing
+ bHandled = FALSE;
+
+ ResizeVideoControl();
+
+ return 0;
+ }
LRESULT CMSVidCtlComp::OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
***************
*** 57,64 ****
--- 116,244 ----
}
+ void __stdcall CMSVidCtlComp::OnClick1()
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnStateChange1(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState)
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnStateChange2(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState)
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnDblClick1()
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnError1(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay)
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnKeyDown1(short* pKeyCode, short Shift)
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnKeyPress1(short* pKeyCode)
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnKeyUp1(short* pKeyCode, short Shift)
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnMouseDown1(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnMouseMove1(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnMouseUp1(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
+ {
+ }
+
+ void __stdcall CMSVidCtlComp::OnError2(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay)
+ {
+ }
+
+ STDMETHODIMP CMSVidCtlComp::OverlayUnavailable()
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::TuneChanged(IMSVidTuner* plpd)
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::CertificateFailure()
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::CertificateSuccess()
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::RatingsBlocked()
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::RatingsUnblocked()
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::RatingsChanged()
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::TimeHole(long StreamOffsetMS, long SizeMS)
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::StaleDataRead()
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::ContentBecomingStale()
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::StaleFileDeleted()
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::EndOfMedia(IMSVidPlayback* lpd)
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::StateChange(IMSVidDevice* plpd, long oldState, long newState)
+ {
+ return S_OK;
+ }
+
+ STDMETHODIMP CMSVidCtlComp::WriteFailure()
+ {
+ return S_OK;
+ }
+
/////////////////////////////////////////////////////////////////////////////
// CVS Log
//
// $Log$
+ // Revision 1.2 2003/02/13 13:42:12 adcockj
+ // Added Event listeners
+ //
// Revision 1.1.1.1 2003/02/13 10:19:08 adcockj
// Initial Import
Index: MSVidCtlComp.h
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/MSVidCtlComp.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MSVidCtlComp.h 13 Feb 2003 10:19:08 -0000 1.1.1.1
--- MSVidCtlComp.h 13 Feb 2003 13:42:13 -0000 1.2
***************
*** 24,27 ****
--- 24,37 ----
#include <atlctl.h>
+ extern _ATL_FUNC_INFO OnClickInfo;
+ extern _ATL_FUNC_INFO OnDblClickInfo;
+ extern _ATL_FUNC_INFO OnError;
+ extern _ATL_FUNC_INFO OnKeyDown;
+ extern _ATL_FUNC_INFO OnKeyPress;
+ extern _ATL_FUNC_INFO OnKeyUp;
+ extern _ATL_FUNC_INFO OnMouseDown;
+ extern _ATL_FUNC_INFO OnMouseMove;
+ extern _ATL_FUNC_INFO OnMouseUp;
+ extern _ATL_FUNC_INFO OnStateChangeInfo;
/////////////////////////////////////////////////////////////////////////////
***************
*** 42,53 ****
public IDataObjectImpl<CMSVidCtlComp>,
public IProvideClassInfo2Impl<&CLSID_MSVidCtlComp, NULL, &LIBID_CLEVERTELLYLib>,
! public CComCoClass<CMSVidCtlComp, &CLSID_MSVidCtlComp>
{
public:
! CMSVidCtlComp()
! {
! m_bWindowOnly = TRUE;
! CalcExtent(m_sizeExtent);
! }
DECLARE_REGISTRY_RESOURCEID(IDR_MSVIDCTLCOMP)
--- 52,65 ----
public IDataObjectImpl<CMSVidCtlComp>,
public IProvideClassInfo2Impl<&CLSID_MSVidCtlComp, NULL, &LIBID_CLEVERTELLYLib>,
! public IDispEventSimpleImpl<IDC_MSVIDCTL1, CMSVidCtlComp, &__uuidof(_IMSVidCtlEvents)>,
! public IDispEventSimpleImpl<IDC_MSVIDCTL2, CMSVidCtlComp, &__uuidof(_IMSVidCtlEvents)>,
! public CComCoClass<CMSVidCtlComp, &CLSID_MSVidCtlComp>,
! public IDispatchImpl<IMSVidStreamBufferSinkEvent, &__uuidof(IMSVidStreamBufferSinkEvent), &LIBID_MSVidCtlLib, 1, 0>,
! public IDispatchImpl<IMSVidStreamBufferSourceEvent, &__uuidof(IMSVidStreamBufferSourceEvent), &LIBID_MSVidCtlLib, 1, 0>,
! public IDispatchImpl<IMSVidTunerEvent, &__uuidof(IMSVidTunerEvent), &LIBID_MSVidCtlLib, 1, 0>,
! public IDispatchImpl<IMSVidVideoRendererEvent, &__uuidof(IMSVidVideoRendererEvent), &LIBID_MSVidCtlLib, 1, 0>
{
public:
! CMSVidCtlComp();
DECLARE_REGISTRY_RESOURCEID(IDR_MSVIDCTLCOMP)
***************
*** 57,61 ****
BEGIN_COM_MAP(CMSVidCtlComp)
COM_INTERFACE_ENTRY(IMSVidCtlComp)
! COM_INTERFACE_ENTRY(IDispatch)
COM_INTERFACE_ENTRY(IViewObjectEx)
COM_INTERFACE_ENTRY(IViewObject2)
--- 69,73 ----
BEGIN_COM_MAP(CMSVidCtlComp)
COM_INTERFACE_ENTRY(IMSVidCtlComp)
! COM_INTERFACE_ENTRY2(IDispatch, IMSVidCtlComp)
COM_INTERFACE_ENTRY(IViewObjectEx)
COM_INTERFACE_ENTRY(IViewObject2)
***************
*** 75,78 ****
--- 87,94 ----
COM_INTERFACE_ENTRY(IProvideClassInfo)
COM_INTERFACE_ENTRY(IProvideClassInfo2)
+ COM_INTERFACE_ENTRY(IMSVidStreamBufferSinkEvent)
+ COM_INTERFACE_ENTRY(IMSVidStreamBufferSourceEvent)
+ COM_INTERFACE_ENTRY(IMSVidTunerEvent)
+ COM_INTERFACE_ENTRY(IMSVidVideoRendererEvent)
END_COM_MAP()
***************
*** 89,92 ****
--- 105,110 ----
MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
MESSAGE_HANDLER(WM_SYSCOMMAND, OnSysCommand)
+ MESSAGE_HANDLER(WM_MOVE, OnMove)
+ MESSAGE_HANDLER(WM_SIZE, OnSize)
COMMAND_ID_HANDLER(WM_CLOSE, OnClose)
END_MSG_MAP()
***************
*** 94,122 ****
LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
BEGIN_SINK_MAP(CMSVidCtlComp)
- //Make sure the Event Handlers have __stdcall calling convention
- END_SINK_MAP()
! STDMETHOD(OnAmbientPropertyChange)(DISPID dispid)
! {
! if (dispid == DISPID_AMBIENT_BACKCOLOR)
! {
! SetBackgroundColorFromAmbient();
! FireViewChange();
! }
! return IOleControlImpl<CMSVidCtlComp>::OnAmbientPropertyChange(dispid);
! }
! // IViewObjectEx
DECLARE_VIEW_STATUS(0)
// IMSVidCtlComp
public:
-
enum { IDD = IDD_MSVIDCTLCOMP };
private:
CComPtr<IMSVidCtl> m_pVidControl;
--- 112,182 ----
LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+ LRESULT OnMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+ LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
BEGIN_SINK_MAP(CMSVidCtlComp)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), DISPID_CLICK, OnClick1, &OnClickInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), DISPID_DBLCLICK, OnDblClick1, &OnDblClickInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), DISPID_ERROREVENT, OnError1, &OnError)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), DISPID_KEYDOWN, OnKeyDown1, &OnKeyDown)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), DISPID_KEYPRESS, OnKeyPress1, &OnKeyPress)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), DISPID_KEYUP, OnKeyUp1, &OnKeyUp)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEDOWN, OnMouseDown1, &OnMouseDown)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEMOVE, OnMouseMove1, &OnMouseMove)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEUP, OnMouseUp1, &OnMouseUp)
! SINK_ENTRY_INFO(IDC_MSVIDCTL1, __uuidof(_IMSVidCtlEvents), dispidStateChange, OnStateChange1, &OnStateChangeInfo)
+ SINK_ENTRY_INFO(IDC_MSVIDCTL2, __uuidof(_IMSVidCtlEvents), DISPID_ERROREVENT, OnError2, &OnError)
+ SINK_ENTRY_INFO(IDC_MSVIDCTL2, __uuidof(_IMSVidCtlEvents), dispidStateChange, OnStateChange2, &OnStateChangeInfo)
+ END_SINK_MAP()
+ STDMETHOD(OnAmbientPropertyChange)(DISPID dispid);
! // IViewObjectEx
DECLARE_VIEW_STATUS(0)
// IMSVidCtlComp
public:
enum { IDD = IDD_MSVIDCTLCOMP };
+
+ // IMSVidVideoRendererEvent
+ STDMETHOD(OverlayUnavailable)();
+ // IMSVidTunerEven
+ STDMETHOD(TuneChanged)(IMSVidTuner* plpd);
+ // IMSVidStreamBufferSourceEvent
+ STDMETHOD(CertificateFailure)();
+ STDMETHOD(CertificateSuccess)();
+ STDMETHOD(RatingsBlocked)();
+ STDMETHOD(RatingsUnblocked)();
+ STDMETHOD(RatingsChanged)();
+ STDMETHOD(TimeHole)(long StreamOffsetMS, long SizeMS);
+ STDMETHOD(StaleDataRead)();
+ STDMETHOD(ContentBecomingStale)();
+ STDMETHOD(StaleFileDeleted)();
+ // IMSVidPlaybackEvent
+ STDMETHOD(EndOfMedia)(IMSVidPlayback* lpd);
+ // IMSVidDeviceEvent
+ STDMETHOD(StateChange)(IMSVidDevice* plpd, long oldState, long newState);
+ // IMSVidStreamBufferSinkEvent
+ STDMETHOD(WriteFailure)();
+
+ private:
+ void ResizeVideoControl();
+ void __stdcall OnClick1();
+ void __stdcall OnDblClick1();
+ void __stdcall OnError1(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay);
+ void __stdcall OnKeyDown1(short* pKeyCode, short Shift);
+ void __stdcall OnKeyPress1(short* pKeyCode);
+ void __stdcall OnKeyUp1(short* pKeyCode, short Shift);
+ void __stdcall OnMouseDown1(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
+ void __stdcall OnMouseMove1(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
+ void __stdcall OnMouseUp1(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
+ void __stdcall OnStateChange1(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState);
+
+ void __stdcall OnError2(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay);
+ void __stdcall OnStateChange2(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState);
+
private:
CComPtr<IMSVidCtl> m_pVidControl;
|
|
From: <ad...@us...> - 2003-02-13 10:53:50
|
Update of /cvsroot/bdadev/CleverTelly In directory sc8-pr-cvs1:/tmp/cvs-serv12983 Modified Files: .cvsignore Removed Files: CleverTelly.h Log Message: CleverTelly.h is autogenerated Index: .cvsignore =================================================================== RCS file: /cvsroot/bdadev/CleverTelly/.cvsignore,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** .cvsignore 13 Feb 2003 10:19:07 -0000 1.1.1.1 --- .cvsignore 13 Feb 2003 10:53:47 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- CleverTelly_p.c dlldata.c + CleverTelly.h CleverTelly.aps CleverTellyps.def --- CleverTelly.h DELETED --- |
|
From: <ad...@us...> - 2003-02-13 10:50:21
|
Update of /cvsroot/bdadev/CleverTelly
In directory sc8-pr-cvs1:/tmp/cvs-serv11441
Modified Files:
CleverTelly.cpp CleverTelly.h StdAfx.h
Added Files:
Module.cpp Module.h
Log Message:
Split out Module stuff and tidy up auto generated ATL code
--- NEW FILE: Module.cpp ---
/////////////////////////////////////////////////////////////////////////////
// $Id: Module.cpp,v 1.1 2003/02/13 10:50:17 adcockj Exp $
/////////////////////////////////////////////////////////////////////////////
// CleverTelly - BDA DVB TV Application
// Copyright (c) 2003 John Adcock. All rights reserved.
/////////////////////////////////////////////////////////////////////////////
//
// This file is subject to the terms of the GNU General Public License as
// published by the Free Software Foundation. A copy of this license is
// included with this software distribution in the file COPYING.txt. If you
// do not have a copy, you may obtain a copy by writing to the Free
// Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
//
// This software is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details
//
/////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "resource.h"
#include "Module.h"
// global instance of Module
CExeModule _Module;
const DWORD CExeModule::dwTimeOut = 5000;
const DWORD CExeModule::dwPause = 1000;
// Passed to CreateThread to monitor the shutdown event
static DWORD WINAPI MonitorProc(void* pv)
{
CExeModule* p = (CExeModule*)pv;
p->MonitorShutdown();
return 0;
}
LONG CExeModule::Unlock()
{
LONG l = CComModule::Unlock();
if (l == 0)
{
bActivity = true;
SetEvent(hEventShutdown); // tell monitor that we transitioned to zero
}
return l;
}
//Monitors the shutdown event
void CExeModule::MonitorShutdown()
{
while (1)
{
WaitForSingleObject(hEventShutdown, INFINITE);
DWORD dwWait=0;
do
{
bActivity = false;
dwWait = WaitForSingleObject(hEventShutdown, dwTimeOut);
} while (dwWait == WAIT_OBJECT_0);
// timed out
if (!bActivity && m_nLockCnt == 0) // if no activity let's really bail
{
#if _WIN32_WINNT >= 0x0400 & defined(_ATL_FREE_THREADED)
CoSuspendClassObjects();
if (!bActivity && m_nLockCnt == 0)
#endif
break;
}
}
CloseHandle(hEventShutdown);
PostThreadMessage(dwThreadID, WM_QUIT, 0, 0);
}
bool CExeModule::StartMonitor()
{
hEventShutdown = CreateEvent(NULL, false, false, NULL);
if (hEventShutdown == NULL)
{
return false;
}
DWORD dwThreadID;
HANDLE h = CreateThread(NULL, 0, MonitorProc, this, 0, &dwThreadID);
return (h != NULL);
}
/////////////////////////////////////////////////////////////////////////////
// CVS Log
//
// $Log: Module.cpp,v $
// Revision 1.1 2003/02/13 10:50:17 adcockj
// Split out Module stuff and tidy up auto generated ATL code
//
// Revision 1.1.1.1 2003/02/13 10:19:07 adcockj
// Initial Import
//
/////////////////////////////////////////////////////////////////////////////
--- NEW FILE: Module.h ---
/////////////////////////////////////////////////////////////////////////////
// $Id: Module.h,v 1.1 2003/02/13 10:50:17 adcockj Exp $
/////////////////////////////////////////////////////////////////////////////
// CleverTelly - BDA DVB TV Application
// Copyright (c) 2003 John Adcock. All rights reserved.
/////////////////////////////////////////////////////////////////////////////
//
// This file is subject to the terms of the GNU General Public License as
// published by the Free Software Foundation. A copy of this license is
// included with this software distribution in the file COPYING.txt. If you
// do not have a copy, you may obtain a copy by writing to the Free
// Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
//
// This software is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details
//
/////////////////////////////////////////////////////////////////////////////
#pragma once
//You may derive a class from CComModule and use it if you want to override
//something, but do not change the name of _Module
class CExeModule : public CComModule
{
public:
LONG Unlock();
DWORD dwThreadID;
HANDLE hEventShutdown;
void MonitorShutdown();
bool StartMonitor();
bool bActivity;
/// Time to wait for threads to finish up
static const DWORD dwPause;
/// time for EXE to be idle before shutting down
static const DWORD dwTimeOut;
};
extern CExeModule _Module;
Index: CleverTelly.cpp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CleverTelly.cpp 13 Feb 2003 10:19:07 -0000 1.1.1.1
--- CleverTelly.cpp 13 Feb 2003 10:50:17 -0000 1.2
***************
*** 27,91 ****
#include "MSVidCtlComp.h"
-
- const DWORD dwTimeOut = 5000; // time for EXE to be idle before shutting down
- const DWORD dwPause = 1000; // time to wait for threads to finish up
-
- // Passed to CreateThread to monitor the shutdown event
- static DWORD WINAPI MonitorProc(void* pv)
- {
- CExeModule* p = (CExeModule*)pv;
- p->MonitorShutdown();
- return 0;
- }
-
- LONG CExeModule::Unlock()
- {
- LONG l = CComModule::Unlock();
- if (l == 0)
- {
- bActivity = true;
- SetEvent(hEventShutdown); // tell monitor that we transitioned to zero
- }
- return l;
- }
-
- //Monitors the shutdown event
- void CExeModule::MonitorShutdown()
- {
- while (1)
- {
- WaitForSingleObject(hEventShutdown, INFINITE);
- DWORD dwWait=0;
- do
- {
- bActivity = false;
- dwWait = WaitForSingleObject(hEventShutdown, dwTimeOut);
- } while (dwWait == WAIT_OBJECT_0);
- // timed out
- if (!bActivity && m_nLockCnt == 0) // if no activity let's really bail
- {
- #if _WIN32_WINNT >= 0x0400 & defined(_ATL_FREE_THREADED)
- CoSuspendClassObjects();
- if (!bActivity && m_nLockCnt == 0)
- #endif
- break;
- }
- }
- CloseHandle(hEventShutdown);
- PostThreadMessage(dwThreadID, WM_QUIT, 0, 0);
- }
-
- bool CExeModule::StartMonitor()
- {
- hEventShutdown = CreateEvent(NULL, false, false, NULL);
- if (hEventShutdown == NULL)
- return false;
- DWORD dwThreadID;
- HANDLE h = CreateThread(NULL, 0, MonitorProc, this, 0, &dwThreadID);
- return (h != NULL);
- }
-
- CExeModule _Module;
-
BEGIN_OBJECT_MAP(ObjectMap)
OBJECT_ENTRY(CLSID_MSVidCtlComp, CMSVidCtlComp)
--- 27,30 ----
***************
*** 121,124 ****
--- 60,64 ----
HRESULT hRes = CoInitialize(NULL);
#endif
+
_ASSERTE(SUCCEEDED(hRes));
_Module.Init(ObjectMap, hInstance, &LIBID_CLEVERTELLYLib);
***************
*** 151,163 ****
{
_Module.StartMonitor();
#if _WIN32_WINNT >= 0x0400 & defined(_ATL_FREE_THREADED)
! hRes = _Module.RegisterClassObjects(CLSCTX_LOCAL_SERVER,
! REGCLS_MULTIPLEUSE | REGCLS_SUSPENDED);
_ASSERTE(SUCCEEDED(hRes));
hRes = CoResumeClassObjects();
#else
! hRes = _Module.RegisterClassObjects(CLSCTX_LOCAL_SERVER,
! REGCLS_MULTIPLEUSE);
#endif
_ASSERTE(SUCCEEDED(hRes));
--- 91,103 ----
{
_Module.StartMonitor();
+
#if _WIN32_WINNT >= 0x0400 & defined(_ATL_FREE_THREADED)
! hRes = _Module.RegisterClassObjects(CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE | REGCLS_SUSPENDED);
_ASSERTE(SUCCEEDED(hRes));
hRes = CoResumeClassObjects();
#else
! hRes = _Module.RegisterClassObjects(CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE);
#endif
+
_ASSERTE(SUCCEEDED(hRes));
***************
*** 180,189 ****
while (GetMessage(&msg, 0, 0, 0))
{
! TranslateMessage(&msg);
DispatchMessage(&msg);
}
_Module.RevokeClassObjects();
! Sleep(dwPause); //wait for any threads to finish
}
--- 120,129 ----
while (GetMessage(&msg, 0, 0, 0))
{
! TranslateMessage(&msg);
DispatchMessage(&msg);
}
_Module.RevokeClassObjects();
! Sleep(CExeModule::dwPause); //wait for any threads to finish
}
***************
*** 197,200 ****
--- 137,143 ----
//
// $Log$
+ // Revision 1.2 2003/02/13 10:50:17 adcockj
+ // Split out Module stuff and tidy up auto generated ATL code
+ //
// Revision 1.1.1.1 2003/02/13 10:19:07 adcockj
// Initial Import
Index: CleverTelly.h
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CleverTelly.h 13 Feb 2003 10:19:07 -0000 1.1.1.1
--- CleverTelly.h 13 Feb 2003 10:50:17 -0000 1.2
***************
*** 3,7 ****
/* File created by MIDL compiler version 5.01.0164 */
! /* at Thu Feb 13 10:13:41 2003
*/
/* Compiler settings for C:\Source\Bdadev\CleverTelly\CleverTelly.idl:
--- 3,7 ----
/* File created by MIDL compiler version 5.01.0164 */
! /* at Thu Feb 13 10:23:31 2003
*/
/* Compiler settings for C:\Source\Bdadev\CleverTelly\CleverTelly.idl:
Index: StdAfx.h
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/StdAfx.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** StdAfx.h 13 Feb 2003 10:19:08 -0000 1.1.1.1
--- StdAfx.h 13 Feb 2003 10:50:17 -0000 1.2
***************
*** 31,50 ****
#include <Msvidctl.h>
! //You may derive a class from CComModule and use it if you want to override
! //something, but do not change the name of _Module
! class CExeModule : public CComModule
! {
! public:
! LONG Unlock();
! DWORD dwThreadID;
! HANDLE hEventShutdown;
! void MonitorShutdown();
! bool StartMonitor();
! bool bActivity;
! };
! extern CExeModule _Module;
#include <atlcom.h>
#include <atlhost.h>
#include <atlctl.h>
//{{AFX_INSERT_LOCATION}}
--- 31,40 ----
#include <Msvidctl.h>
! #include "Module.h"
!
#include <atlcom.h>
#include <atlhost.h>
#include <atlctl.h>
+
//{{AFX_INSERT_LOCATION}}
|
|
From: <ad...@us...> - 2003-02-13 09:56:14
|
Update of /cvsroot/bdadev/CVSROOT
In directory sc8-pr-cvs1:/tmp/cvs-serv14482
Modified Files:
loginfo
Log Message:
Try again
Index: loginfo
===================================================================
RCS file: /cvsroot/bdadev/CVSROOT/loginfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** loginfo 13 Feb 2003 09:54:30 -0000 1.5
--- loginfo 13 Feb 2003 09:56:07 -0000 1.6
***************
*** 27,28 ****
--- 27,29 ----
DEFAULT /cvsroot/sitedocs/CVSROOT/cvstools/syncmail %{sVv} bda...@li...
+
|
