Menu
▾
▴
[Bdadev-cvs] CleverTelly MainDlg.cpp,NONE,1.1 MainDlg.h,NONE,1.1 CleverTelly.cpp,1.3,1.4 CleverTelly.dsp,1.2,1.3 CleverTelly.dsw,1.1.1.1,1.2 CleverTelly.idl,1.1.1.1,1.2 CleverTelly.rc,1.2,1.3 MSVidCtlComp.cpp,1.3,1.4 MSVidCtlComp.h,1.2,1.3 StdAfx.cpp,1.1.1.1,1.2 StdAfx.h,1.3,1.4 resource.h,1.2,1.3
|
From: <ad...@us...> - 2003-02-24 17:01:50
|
Update of /cvsroot/bdadev/CleverTelly
In directory sc8-pr-cvs1:/tmp/cvs-serv14688
Modified Files:
CleverTelly.cpp CleverTelly.dsp CleverTelly.dsw
CleverTelly.idl CleverTelly.rc MSVidCtlComp.cpp MSVidCtlComp.h
StdAfx.cpp StdAfx.h resource.h
Added Files:
MainDlg.cpp MainDlg.h
Log Message:
Migrated to WTL and stopped using composite control for hosting
--- NEW FILE: MainDlg.cpp ---
// maindlg.cpp : implementation of the CMainDlg class
//
/////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "resource.h"
#include "maindlg.h"
_ATL_FUNC_INFO OnClickInfo = {CC_STDCALL, VT_EMPTY, 0};
_ATL_FUNC_INFO OnDblClickInfo = {CC_STDCALL, VT_EMPTY, 0};
_ATL_FUNC_INFO OnErrorInfo = {CC_STDCALL, VT_EMPTY, 7, {VT_I2, VT_PTR, VT_I4, VT_BSTR, VT_BSTR, VT_I4, VT_PTR} };
_ATL_FUNC_INFO OnKeyDownInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR, VT_I2} };
_ATL_FUNC_INFO OnKeyPressInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR} };
_ATL_FUNC_INFO OnKeyUpInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR, VT_I2} };
_ATL_FUNC_INFO OnMouseDownInfo = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
_ATL_FUNC_INFO OnMouseMoveInfo = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
_ATL_FUNC_INFO OnMouseUpInfo = {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} };
/////////////////////////////////////////////////////////////////////////////
// CMainDlg
LRESULT CMainDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
{
// center the dialog on the screen
CenterWindow();
// set icons
HICON hIcon = (HICON)::LoadImage(_Module.GetResourceInstance(), MAKEINTRESOURCE(IDR_MAINFRAME),
IMAGE_ICON, ::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON), LR_DEFAULTCOLOR);
SetIcon(hIcon, TRUE);
HICON hIconSmall = (HICON)::LoadImage(_Module.GetResourceInstance(), MAKEINTRESOURCE(IDR_MAINFRAME),
IMAGE_ICON, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);
SetIcon(hIconSmall, FALSE);
HRESULT Result = GetDlgControl(IDC_MSVIDCTL, __uuidof(IMSVidCtl), reinterpret_cast<void **>(&m_pVidControl));
if(FAILED(Result))
{
ATLTRACE("GetDlgControl Returned %8x\n", Result);
return FALSE;
}
Result = CreateTuneReqStore();
if(FAILED(Result))
{
ATLTRACE("CreateTuneReqStore Returned %8x\n", Result);
return FALSE;
}
Result = LoadUpDefaultTuneRequest();
if(FAILED(Result))
{
ATLTRACE("LoadUpDefaultTuneRequest Returned %8x\n", Result);
return FALSE;
}
return TRUE;
}
LRESULT CMainDlg::OnAppAbout(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
{
CSimpleDialog<IDD_ABOUTBOX, FALSE> dlg;
dlg.DoModal();
return 0;
}
LRESULT CMainDlg::OnClose(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
{
m_pVidControl.Release();
CComBSTR Name(L"C:\\Channels.xml");
m_TuneRequestStore->Save(Name);
m_TuneRequestStore.Release();
EndDialog(wID);
return 0;
}
void CMainDlg::ResizeVideoControl()
{
RECT WinRect;
CWindow hwndVC(GetDlgItem(IDC_MSVIDCTL));
GetWindowRect(&WinRect);
ScreenToClient(&WinRect);
hwndVC.MoveWindow(&WinRect, TRUE);
}
LRESULT CMainDlg::OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
bHandled = FALSE; // always do default processing
if (wParam == SC_CLOSE)
{
OnClose(NULL, NULL, NULL, bHandled);
}
return 0;
}
LRESULT CMainDlg::OnMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
// always do default processing
bHandled = FALSE;
return 0;
}
LRESULT CMainDlg::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
// 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;
}
void __stdcall CMainDlg::OnClick()
{
ATLTRACE("OnClick\n");
}
void __stdcall CMainDlg::OnStateChange(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState)
{
}
void __stdcall CMainDlg::OnDblClick()
{
}
void __stdcall CMainDlg::OnError(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay)
{
ATLTRACE("OnError %04x\n", Number);
}
void __stdcall CMainDlg::OnKeyDown(short* pKeyCode, short Shift)
{
}
void __stdcall CMainDlg::OnKeyPress(short* pKeyCode)
{
ATLTRACE("OnKeyPress %04x\n", *pKeyCode);
}
void __stdcall CMainDlg::OnKeyUp(short* pKeyCode, short Shift)
{
}
void __stdcall CMainDlg::OnMouseDown(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
{
}
void __stdcall CMainDlg::OnMouseMove(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
{
}
void __stdcall CMainDlg::OnMouseUp(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
{
}
STDMETHODIMP CMainDlg::OverlayUnavailable()
{
ATLTRACE("OverlayUnavailable\n");
return S_OK;
}
STDMETHODIMP CMainDlg::TuneChanged(IMSVidTuner* plpd)
{
ATLTRACE("TuneChanged\n");
return S_OK;
}
STDMETHODIMP CMainDlg::CertificateFailure()
{
ATLTRACE("CertificateFailure\n");
return S_OK;
}
STDMETHODIMP CMainDlg::CertificateSuccess()
{
ATLTRACE("CertificateSuccess\n");
return S_OK;
}
STDMETHODIMP CMainDlg::RatingsBlocked()
{
ATLTRACE("RatingsBlocked\n");
return S_OK;
}
STDMETHODIMP CMainDlg::RatingsUnblocked()
{
ATLTRACE("RatingsUnblocked\n");
return S_OK;
}
STDMETHODIMP CMainDlg::RatingsChanged()
{
ATLTRACE("RatingsChanged\n");
return S_OK;
}
STDMETHODIMP CMainDlg::TimeHole(long StreamOffsetMS, long SizeMS)
{
ATLTRACE("TimeHole\n");
return S_OK;
}
STDMETHODIMP CMainDlg::StaleDataRead()
{
ATLTRACE("StaleDataRead\n");
return S_OK;
}
STDMETHODIMP CMainDlg::ContentBecomingStale()
{
ATLTRACE("ContentBecomingStale\n");
return S_OK;
}
STDMETHODIMP CMainDlg::StaleFileDeleted()
{
ATLTRACE("StaleFileDeleted\n");
return S_OK;
}
STDMETHODIMP CMainDlg::EndOfMedia(IMSVidPlayback* lpd)
{
ATLTRACE("EndOfMedia\n");
return S_OK;
}
STDMETHODIMP CMainDlg::StateChange(IMSVidDevice* plpd, long oldState, long newState)
{
HRESULT Result = S_OK;
if(newState == STATE_PLAY)
{
Result = m_TuneRequestStore->AttachToVideoControl(m_pVidControl);
}
else if(newState == STATE_UNBUILT)
{
Result = m_TuneRequestStore->DetachFromTIF();
}
return Result;
}
STDMETHODIMP CMainDlg::WriteFailure()
{
ATLTRACE("WriteFailure\n");
return S_OK;
}
HRESULT CMainDlg::LoadUpDefaultTuneRequest()
{
return S_OK;
}
HRESULT CMainDlg::CreateTuneReqStore()
{
HRESULT Result = m_TuneRequestStore.CreateInstance(__uuidof(TUNEREQSTORELib::TuneRequestStore));
if (SUCCEEDED(Result))
{
CComBSTR FileName(L"C:\\Channels.xml");
Result = m_TuneRequestStore->Load(FileName);
SysFreeString(FileName);
}
}
--- NEW FILE: MainDlg.h ---
// maindlg.h : interface of the CMainDlg class
//
/////////////////////////////////////////////////////////////////////////////
#if !defined(AFX_MAINDLG_H__CCE886BB_480B_11D7_B841_0002A5623377__INCLUDED_)
#define AFX_MAINDLG_H__CCE886BB_480B_11D7_B841_0002A5623377__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
#include "CleverTelly.h"
extern _ATL_FUNC_INFO OnClickInfo;
extern _ATL_FUNC_INFO OnDblClickInfo;
extern _ATL_FUNC_INFO OnErrorInfo;
extern _ATL_FUNC_INFO OnKeyDownInfo;
extern _ATL_FUNC_INFO OnKeyPressInfo;
extern _ATL_FUNC_INFO OnKeyUpInfo;
extern _ATL_FUNC_INFO OnMouseDownInfo;
extern _ATL_FUNC_INFO OnMouseMoveInfo;
extern _ATL_FUNC_INFO OnMouseUpInfo;
extern _ATL_FUNC_INFO OnStateChangeInfo;
class CMainDlg : public CAxDialogImpl<CMainDlg>,
public CComObjectRootEx<CComSingleThreadModel>,
public IDispatchImpl<IApplication, &IID_IApplication, &LIBID_CLEVERTELLYLib>,
public IProvideClassInfo2Impl<&CLSID_Application, NULL, &LIBID_CLEVERTELLYLib>,
public IDispEventSimpleImpl<IDC_MSVIDCTL, CMainDlg, &__uuidof(_IMSVidCtlEvents)>,
public CComCoClass<CMainDlg, &CLSID_Application>,
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:
enum { IDD = IDD_MAINDLG };
DECLARE_REGISTRY_RESOURCEID(IDR_CleverTellyReg)
DECLARE_PROTECT_FINAL_CONSTRUCT()
BEGIN_COM_MAP(CMainDlg)
COM_INTERFACE_ENTRY(IApplication)
COM_INTERFACE_ENTRY2(IDispatch, IApplication)
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()
BEGIN_MSG_MAP(CMainDlg)
MESSAGE_HANDLER(WM_SYSCOMMAND, OnSysCommand)
MESSAGE_HANDLER(WM_MOVE, OnMove)
MESSAGE_HANDLER(WM_SIZE, OnSize)
COMMAND_ID_HANDLER(WM_CLOSE, OnClose)
MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
COMMAND_ID_HANDLER(IDM_ABOUT, OnAppAbout)
COMMAND_ID_HANDLER(IDOK, OnClose)
COMMAND_ID_HANDLER(IDCANCEL, OnClose)
END_MSG_MAP()
BEGIN_SINK_MAP(CMainDlg)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_CLICK, OnClick, &OnClickInfo)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_DBLCLICK, OnDblClick, &OnDblClickInfo)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_ERROREVENT, OnError, &OnErrorInfo)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYDOWN, OnKeyDown, &OnKeyDownInfo)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYPRESS, OnKeyPress, &OnKeyPressInfo)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYUP, OnKeyUp, &OnKeyUpInfo)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEDOWN, OnMouseDown, &OnMouseDownInfo)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEMOVE, OnMouseMove, &OnMouseMoveInfo)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEUP, OnMouseUp, &OnMouseUpInfo)
SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), dispidStateChange, OnStateChange, &OnStateChangeInfo)
END_SINK_MAP()
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 OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
LRESULT OnAppAbout(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
LRESULT OnClose(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
// IMSVidCtlComp
public:
// 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 OnClick();
void __stdcall OnDblClick();
void __stdcall OnError(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay);
void __stdcall OnKeyDown(short* pKeyCode, short Shift);
void __stdcall OnKeyPress(short* pKeyCode);
void __stdcall OnKeyUp(short* pKeyCode, short Shift);
void __stdcall OnMouseDown(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
void __stdcall OnMouseMove(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
void __stdcall OnMouseUp(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y);
void __stdcall OnStateChange(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState);
HRESULT LoadUpDefaultTuneRequest();
HRESULT CreateTuneReqStore();
private:
CComQIPtr<IMSVidCtl> m_pVidControl;
TUNEREQSTORELib::ITuneRequestStorePtr m_TuneRequestStore;
};
/////////////////////////////////////////////////////////////////////////////
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_MAINDLG_H__CCE886BB_480B_11D7_B841_0002A5623377__INCLUDED_)
Index: CleverTelly.cpp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CleverTelly.cpp 13 Feb 2003 17:26:44 -0000 1.3
--- CleverTelly.cpp 24 Feb 2003 17:01:31 -0000 1.4
***************
*** 1,35 ****
! /////////////////////////////////////////////////////////////////////////////
! // $Id$
! /////////////////////////////////////////////////////////////////////////////
! // 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 <initguid.h>
#include "CleverTelly.h"
#include "CleverTelly_i.c"
- #include "MSVidCtlComp.h"
BEGIN_OBJECT_MAP(ObjectMap)
! OBJECT_ENTRY(CLSID_MSVidCtlComp, CMSVidCtlComp)
END_OBJECT_MAP()
LPCTSTR FindOneOf(LPCTSTR p1, LPCTSTR p2)
{
--- 1,23 ----
! // CleverTelly.cpp : main source file for CleverTelly.exe
//
#include "stdafx.h"
+
#include "resource.h"
+
+ #include "maindlg.h"
+
#include <initguid.h>
#include "CleverTelly.h"
#include "CleverTelly_i.c"
BEGIN_OBJECT_MAP(ObjectMap)
! OBJECT_ENTRY(CLSID_Application, CMainDlg)
END_OBJECT_MAP()
+ CAppModule _Module;
+
LPCTSTR FindOneOf(LPCTSTR p1, LPCTSTR p2)
{
***************
*** 47,180 ****
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);
- }
! /////////////////////////////////////////////////////////////////////////////
! //
! extern "C" int WINAPI _tWinMain(HINSTANCE hInstance,
! HINSTANCE /*hPrevInstance*/, LPTSTR lpCmdLine, int /*nShowCmd*/)
{
! lpCmdLine = GetCommandLine(); //this line necessary for _ATL_MIN_CRT
!
! #if _WIN32_WINNT >= 0x0400 & defined(_ATL_FREE_THREADED)
! HRESULT hRes = CoInitializeEx(NULL, COINIT_MULTITHREADED);
! #else
! HRESULT hRes = CoInitialize(NULL);
! #endif
!
! _ASSERTE(SUCCEEDED(hRes));
! _Module.Init(ObjectMap, hInstance, &LIBID_CLEVERTELLYLib);
! _Module.dwThreadID = GetCurrentThreadId();
! TCHAR szTokens[] = _T("-/");
!
! int nRet = 0;
! BOOL bRun = TRUE;
! LPCTSTR lpszToken = FindOneOf(lpCmdLine, szTokens);
! while (lpszToken != NULL)
! {
! if (lstrcmpi(lpszToken, _T("UnregServer"))==0)
! {
! _Module.UpdateRegistryFromResource(IDR_CleverTelly, FALSE);
! nRet = _Module.UnregisterServer(TRUE);
! bRun = FALSE;
! break;
! }
! if (lstrcmpi(lpszToken, _T("RegServer"))==0)
! {
! _Module.UpdateRegistryFromResource(IDR_CleverTelly, TRUE);
! nRet = _Module.RegisterServer(TRUE);
! bRun = FALSE;
! break;
! }
! lpszToken = FindOneOf(lpszToken, szTokens);
! }
!
! if (bRun)
! {
! _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));
!
! CreateNewClass();
! AtlAxWinInit();
! HWND hWnd = ::CreateWindow(
! TEXT("AtlAxWin"),
! TEXT("CleverTelly.MSVidCtlComp"),
! WS_POPUP,
! CW_USEDEFAULT,
! CW_USEDEFAULT,
! CW_USEDEFAULT,
! CW_USEDEFAULT,
! NULL,
! NULL,
! ::GetModuleHandle(NULL),
! NULL
! );
! ::SetWindowText(hWnd, TEXT("CleverTelly"));
! ::ShowWindow(hWnd, SW_SHOW);
! MSG msg;
! while (GetMessage(&msg, 0, 0, 0))
! {
! TranslateMessage(&msg);
! DispatchMessage(&msg);
! }
! _Module.RevokeClassObjects();
! Sleep(CExeModule::dwPause); //wait for any threads to finish
! }
! _Module.Term();
! // close the log file
! LOG(0, NULL);
! CoUninitialize();
! return nRet;
}
-
- /////////////////////////////////////////////////////////////////////////////
- // CVS Log
- //
- // $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
- //
- // Revision 1.1.1.1 2003/02/13 10:19:07 adcockj
- // Initial Import
- //
- /////////////////////////////////////////////////////////////////////////////
--- 35,69 ----
return NULL;
}
! int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPTSTR lpstrCmdLine, int nCmdShow)
{
! HRESULT hRes = ::CoInitialize(NULL);
! // If you are running on NT 4.0 or higher you can use the following call instead to
! // make the EXE free threaded. This means that calls come in on a random RPC thread.
! // HRESULT hRes = ::CoInitializeEx(NULL, COINIT_MULTITHREADED);
! ATLASSERT(SUCCEEDED(hRes));
! // this resolves ATL window thunking problem when Microsoft Layer for Unicode (MSLU) is used
! ::DefWindowProc(NULL, 0, 0, 0L);
! AtlInitCommonControls(ICC_COOL_CLASSES | ICC_BAR_CLASSES); // add flags to support other controls
! hRes = _Module.Init(NULL, hInstance);
! ATLASSERT(SUCCEEDED(hRes));
! AtlAxWinInit();
! int nRet = 0;
! // BLOCK: Run application
! {
! CComObject<CMainDlg>* pApplication = new CComObject<CMainDlg>;
! nRet = pApplication->DoModal();
! delete pApplication;
! }
! _Module.Term();
! ::CoUninitialize();
! return nRet;
}
Index: CleverTelly.dsp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CleverTelly.dsp 13 Feb 2003 17:26:44 -0000 1.2
--- CleverTelly.dsp 24 Feb 2003 17:01:32 -0000 1.3
***************
*** 34,40 ****
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "CleverTelly___Win32_Release"
! # PROP BASE Intermediate_Dir "CleverTelly___Win32_Release"
! # PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
--- 34,39 ----
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "Release"
! # PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
***************
*** 44,49 ****
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
--- 43,50 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
***************
*** 52,75 ****
# ADD BSC32 /nologo
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
! TargetPath=.\Release\CleverTelly.exe
! InputPath=.\Release\CleverTelly.exe
! SOURCE="$(InputPath)"
!
! "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
! if "%OS%"=="" goto NOTNT
! if not "%OS%"=="Windows_NT" goto NOTNT
! "$(TargetPath)" /RegServer
! echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
! echo Server registration done!
! goto end
! :NOTNT
! echo Warning : Cannot register Unicode EXE on Windows 95
! :end
!
! # End Custom Build
!ELSEIF "$(CFG)" == "CleverTelly - Win32 Debug"
--- 53,58 ----
# ADD BSC32 /nologo
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 /nologo /subsystem:windows /machine:I386
! # ADD LINK32 striids.lib 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
!ELSEIF "$(CFG)" == "CleverTelly - Win32 Debug"
***************
*** 77,83 ****
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "CleverTelly___Win32_Debug"
! # PROP BASE Intermediate_Dir "CleverTelly___Win32_Debug"
! # PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
--- 60,65 ----
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "Debug"
! # PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
***************
*** 87,92 ****
# PROP Ignore_Export_Lib 0
# 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"
--- 69,76 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /Yu"stdafx.h" /FD /GZ /c
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
***************
*** 95,118 ****
# ADD BSC32 /nologo
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
! TargetPath=.\Debug\CleverTelly.exe
! InputPath=.\Debug\CleverTelly.exe
! SOURCE="$(InputPath)"
!
! "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
! if "%OS%"=="" goto NOTNT
! if not "%OS%"=="Windows_NT" goto NOTNT
! "$(TargetPath)" /RegServer
! echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
! echo Server registration done!
! goto end
! :NOTNT
! echo Warning : Cannot register Unicode EXE on Windows 95
! :end
!
! # End Custom Build
!ENDIF
--- 79,84 ----
# ADD BSC32 /nologo
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 /nologo /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 /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ENDIF
***************
*** 132,137 ****
SOURCE=.\CleverTelly.idl
! # ADD BASE MTL /tlb ".\CleverTelly.tlb" /h "CleverTelly.h" /iid "CleverTelly_i.c" /Oicf
! # ADD MTL /tlb ".\CleverTelly.tlb" /h "CleverTelly.h" /iid "CleverTelly_i.c" /Oicf
# End Source File
# Begin Source File
--- 98,102 ----
SOURCE=.\CleverTelly.idl
! # SUBTRACT MTL /mktyplib203
# End Source File
# Begin Source File
***************
*** 141,158 ****
# 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
# Begin Source File
! SOURCE=.\StdAfx.cpp
! # ADD BASE CPP /Yc"stdafx.h"
# ADD CPP /Yc"stdafx.h"
# End Source File
--- 106,114 ----
# Begin Source File
! SOURCE=.\maindlg.cpp
# End Source File
# Begin Source File
! SOURCE=.\stdafx.cpp
# ADD CPP /Yc"stdafx.h"
# End Source File
***************
*** 163,183 ****
# 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
# Begin Source File
! SOURCE=.\Resource.h
# End Source File
# Begin Source File
! SOURCE=.\StdAfx.h
# End Source File
# End Group
--- 119,131 ----
# Begin Source File
! SOURCE=.\maindlg.h
# End Source File
# Begin Source File
! SOURCE=.\resource.h
# End Source File
# Begin Source File
! SOURCE=.\stdafx.h
# End Source File
# End Group
***************
*** 187,210 ****
# 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
! SOURCE=.\MSVidCtlComp.rgs
# End Source File
# End Group
# End Target
# End Project
- # Section CleverTelly : {00000000-0000-0000-0000-800000800000}
- # 1:16:IDR_MSVIDCTLCOMP:102
- # 1:16:IDB_MSVIDCTLCOMP:101
- # 1:16:IDD_MSVIDCTLCOMP:103
- # End Section
--- 135,145 ----
# Begin Source File
! SOURCE=.\res\CleverTelly.exe.manifest
# End Source File
# Begin Source File
! SOURCE=.\res\CleverTelly.ico
# End Source File
# End Group
# End Target
# End Project
Index: CleverTelly.dsw
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.dsw,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CleverTelly.dsw 13 Feb 2003 10:19:07 -0000 1.1.1.1
--- CleverTelly.dsw 24 Feb 2003 17:01:33 -0000 1.2
***************
*** 12,15 ****
--- 12,30 ----
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name TuneReqStore
+ End Project Dependency
+ }}}
+
+ ###############################################################################
+
+ Project: "TuneReqStore"=..\TuneReqStore\TuneReqStore.dsp - Package Owner=<4>
+
+ Package=<5>
+ {{{
+ }}}
+
+ Package=<4>
+ {{{
}}}
Index: CleverTelly.idl
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.idl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CleverTelly.idl 13 Feb 2003 10:19:07 -0000 1.1.1.1
--- CleverTelly.idl 24 Feb 2003 17:01:33 -0000 1.2
***************
*** 28,35 ****
uuid(F987AE23-B86A-4FC0-BAE9-D553BE70C7B9),
dual,
! helpstring("IMSVidCtlComp Interface"),
pointer_default(unique)
]
! interface IMSVidCtlComp : IDispatch
{
};
--- 28,35 ----
uuid(F987AE23-B86A-4FC0-BAE9-D553BE70C7B9),
dual,
! helpstring("IApplication Interface"),
pointer_default(unique)
]
! interface IApplication : IDispatch
{
};
***************
*** 47,55 ****
[
uuid(705B1406-73E0-46DF-BF76-7D1496AD33A3),
! helpstring("MSVidCtlComp Class")
]
! coclass MSVidCtlComp
{
! [default] interface IMSVidCtlComp;
};
};
--- 47,55 ----
[
uuid(705B1406-73E0-46DF-BF76-7D1496AD33A3),
! helpstring("Application Class")
]
! coclass Application
{
! [default] interface IApplication;
};
};
***************
*** 59,62 ****
--- 59,65 ----
//
// $Log$
+ // Revision 1.2 2003/02/24 17:01:33 adcockj
+ // Migrated to WTL and stopped using composite control for hosting
+ //
// Revision 1.1.1.1 2003/02/13 10:19:07 adcockj
// Initial Import
Index: CleverTelly.rc
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/CleverTelly.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CleverTelly.rc 13 Feb 2003 17:26:45 -0000 1.2
--- CleverTelly.rc 24 Feb 2003 17:01:35 -0000 1.3
***************
*** 8,12 ****
// Generated from the TEXTINCLUDE 2 resource.
//
! #include "winres.h"
/////////////////////////////////////////////////////////////////////////////
--- 8,12 ----
// Generated from the TEXTINCLUDE 2 resource.
//
! #include "atlres.h"
/////////////////////////////////////////////////////////////////////////////
***************
*** 35,39 ****
2 TEXTINCLUDE DISCARDABLE
BEGIN
! "#include ""winres.h""\r\n"
"\0"
END
--- 35,39 ----
2 TEXTINCLUDE DISCARDABLE
BEGIN
! "#include ""atlres.h""\r\n"
"\0"
END
***************
*** 41,45 ****
3 TEXTINCLUDE DISCARDABLE
BEGIN
! "1 TYPELIB ""CleverTelly.tlb""\r\n"
"\0"
END
--- 41,45 ----
3 TEXTINCLUDE DISCARDABLE
BEGIN
! "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""res\\\\CleverTelly.exe.manifest""\r\n"
"\0"
END
***************
*** 47,50 ****
--- 47,150 ----
#endif // APSTUDIO_INVOKED
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // REGISTRY
+ //
+
+ IDR_CleverTellyReg REGISTRY DISCARDABLE "CleverTelly.rgs"
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Icon
+ //
+
+ // Icon with lowest ID value placed first to ensure application icon
+ // remains consistent on all systems.
+ IDR_MAINFRAME ICON DISCARDABLE "res\\CleverTelly.ico"
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Dialog
+ //
+
+ IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 187, 102
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "About"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ DEFPUSHBUTTON "OK",IDOK,130,81,50,14
+ CTEXT "CleverTelly Application v1.0\n\n(c) Copyright 2003",
+ IDC_STATIC,25,57,78,32
+ ICON IDR_MAINFRAME,IDC_STATIC,55,26,18,20
+ GROUPBOX "",IDC_STATIC,7,7,115,88
+ END
+
+ IDD_MAINDLG 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_MSVIDCTL,"{B0EDF163-910A-11D2-B632-00C04F79498E}",
+ WS_TABSTOP,0,0,238,206
+ END
+
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Dialog Info
+ //
+
+ IDD_MAINDLG DLGINIT
+ BEGIN
+ IDC_MSVIDCTL, 0x376, 34, 0
+ 0x0000, 0x0000, 0x0300, 0x0000, 0x3de9, 0x0000, 0x3270, 0x0000, 0x000b,
+ 0xffff, 0x000b, 0xffff, 0x000b, 0x0000, 0x0013, 0x0000, 0x0000,
+ END
+
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // DESIGNINFO
+ //
+
+ #ifdef APSTUDIO_INVOKED
+ GUIDELINES DESIGNINFO DISCARDABLE
+ BEGIN
+ IDD_ABOUTBOX, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 180
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 95
+ END
+ END
+ #endif // APSTUDIO_INVOKED
+
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Accelerator
+ //
+
+ IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
+ BEGIN
+ "N", ID_FILE_NEW, VIRTKEY, CONTROL
+ "O", ID_FILE_OPEN, VIRTKEY, CONTROL
+ "S", ID_FILE_SAVE, VIRTKEY, CONTROL
+ "P", ID_FILE_PRINT, VIRTKEY, CONTROL
+ "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL
+ "X", ID_EDIT_CUT, VIRTKEY, CONTROL
+ "C", ID_EDIT_COPY, VIRTKEY, CONTROL
+ "V", ID_EDIT_PASTE, VIRTKEY, CONTROL
+ VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT
+ VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT
+ VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL
+ VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT
+ VK_F6, ID_NEXT_PANE, VIRTKEY
+ VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT
+ END
+
#ifndef _MAC
***************
*** 64,68 ****
#endif
FILEOS 0x4L
! FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
--- 164,168 ----
#endif
FILEOS 0x4L
! FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
***************
*** 72,83 ****
BEGIN
VALUE "CompanyName", "\0"
! VALUE "FileDescription", "CleverTelly Module\0"
VALUE "FileVersion", "1, 0, 0, 1\0"
! VALUE "InternalName", "CleverTelly\0"
VALUE "LegalCopyright", "Copyright 2003\0"
! VALUE "OriginalFilename", "CleverTelly.EXE\0"
VALUE "ProductName", "CleverTelly Module\0"
VALUE "ProductVersion", "1, 0, 0, 1\0"
- VALUE "OLESelfRegister", "\0"
END
END
--- 172,182 ----
BEGIN
VALUE "CompanyName", "\0"
! VALUE "FileDescription", "test1 Module\0"
VALUE "FileVersion", "1, 0, 0, 1\0"
! VALUE "InternalName", "TEST1\0"
VALUE "LegalCopyright", "Copyright 2003\0"
! VALUE "OriginalFilename", "CleverTelly.exe\0"
VALUE "ProductName", "CleverTelly Module\0"
VALUE "ProductVersion", "1, 0, 0, 1\0"
END
END
***************
*** 93,109 ****
/////////////////////////////////////////////////////////////////////////////
//
! // REGISTRY
//
! IDR_CleverTelly REGISTRY MOVEABLE PURE "CleverTelly.rgs"
! /////////////////////////////////////////////////////////////////////////////
! //
! // String Table
! //
STRINGTABLE DISCARDABLE
BEGIN
! IDS_PROJNAME "CleverTelly"
END
--- 192,285 ----
/////////////////////////////////////////////////////////////////////////////
//
! // String Table
//
! STRINGTABLE PRELOAD DISCARDABLE
! BEGIN
! IDR_MAINFRAME "CleverTelly"
! END
! STRINGTABLE DISCARDABLE
! BEGIN
! ID_FILE_NEW "Create a new document\nNew"
! ID_FILE_OPEN "Open an existing document\nOpen"
! ID_FILE_CLOSE "Close the active document\nClose"
! ID_FILE_SAVE "Save the active document\nSave"
! ID_FILE_SAVE_AS "Save the active document with a new name\nSave As"
! ID_FILE_PAGE_SETUP "Change the printing options\nPage Setup"
! ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup"
! ID_FILE_PRINT "Print the active document\nPrint"
! ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview"
! END
STRINGTABLE DISCARDABLE
BEGIN
! ID_APP_ABOUT "Display program information, version number and copyright\nAbout"
! ID_APP_EXIT "Quit the application; prompts to save documents\nExit"
! END
!
! STRINGTABLE DISCARDABLE
! BEGIN
! ID_NEXT_PANE "Switch to the next window pane\nNext Pane"
! ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"
! END
!
! STRINGTABLE DISCARDABLE
! BEGIN
! ID_WINDOW_NEW "Open another window for the active document\nNew Window"
! ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons"
! ID_WINDOW_CASCADE "Arrange windows so they overlap\nCascade Windows"
! ID_WINDOW_TILE_HORZ "Arrange windows as non-overlapping tiles\nTile Windows"
! ID_WINDOW_TILE_VERT "Arrange windows as non-overlapping tiles\nTile Windows"
! ID_WINDOW_SPLIT "Split the active window into panes\nSplit"
! END
!
! STRINGTABLE DISCARDABLE
! BEGIN
! ID_EDIT_CLEAR "Erase the selection\nErase"
! ID_EDIT_CLEAR_ALL "Erase everything\nErase All"
! ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy"
! ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut"
! ID_EDIT_FIND "Find the specified text\nFind"
! ID_EDIT_PASTE "Insert Clipboard contents\nPaste"
! ID_EDIT_REPEAT "Repeat the last action\nRepeat"
! ID_EDIT_REPLACE "Replace specific text with different text\nReplace"
! ID_EDIT_SELECT_ALL "Select the entire document\nSelect All"
! ID_EDIT_UNDO "Undo the last action\nUndo"
! ID_EDIT_REDO "Redo the previously undone action\nRedo"
! END
!
! STRINGTABLE DISCARDABLE
! BEGIN
! ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"
! ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"
! END
!
! STRINGTABLE DISCARDABLE
! BEGIN
! ATL_IDS_SCSIZE "Change the window size"
! ATL_IDS_SCMOVE "Change the window position"
! ATL_IDS_SCMINIMIZE "Reduce the window to an icon"
! ATL_IDS_SCMAXIMIZE "Enlarge the window to full size"
! ATL_IDS_SCNEXTWINDOW "Switch to the next document window"
! ATL_IDS_SCPREVWINDOW "Switch to the previous document window"
! ATL_IDS_SCCLOSE "Close the active window and prompts to save the documents"
! END
!
! STRINGTABLE DISCARDABLE
! BEGIN
! ATL_IDS_SCRESTORE "Restore the window to normal size"
! ATL_IDS_SCTASKLIST "Activate Task List"
! ATL_IDS_MDICHILD "Activate this window"
! END
!
! STRINGTABLE DISCARDABLE
! BEGIN
! ATL_IDS_IDLEMESSAGE "Ready"
! END
!
! STRINGTABLE DISCARDABLE
! BEGIN
! ATL_IDS_MRU_FILE "Open this document"
END
***************
*** 123,182 ****
/////////////////////////////////////////////////////////////////////////////
//
! // REGISTRY
! //
!
! IDR_MSVIDCTLCOMP REGISTRY DISCARDABLE "MSVidCtlComp.rgs"
!
! /////////////////////////////////////////////////////////////////////////////
! //
! // Bitmap
! //
!
! IDB_MSVIDCTLCOMP BITMAP DISCARDABLE "msvidctl.bmp"
!
! /////////////////////////////////////////////////////////////////////////////
! //
! // Dialog
! //
!
! 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
! END
!
!
! /////////////////////////////////////////////////////////////////////////////
! //
! // Dialog Info
//
! IDD_MSVIDCTLCOMP DLGINIT
BEGIN
! IDC_MSVIDCTL1, 0x376, 34, 0
! 0x0000, 0x0000, 0x0300, 0x0000, 0x3de9, 0x0000, 0x3270, 0x0000, 0x000b,
! 0xffff, 0x000b, 0xffff, 0x000b, 0x0000, 0x0013, 0x0000, 0x0000,
! IDC_MSVIDCTL2, 0x376, 34, 0
! 0x0000, 0x0000, 0x0300, 0x0000, 0x13d8, 0x0000, 0x13d8, 0x0000, 0x000b,
! 0x0000, 0x000b, 0x0000, 0x000b, 0x0000, 0x0013, 0x0000, 0x0000,
! 0
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
/////////////////////////////////////////////////////////////////////////////
--- 299,313 ----
/////////////////////////////////////////////////////////////////////////////
//
! // Menu
//
! IDR_CLEVERTELLY MENU DISCARDABLE
BEGIN
! POPUP "Help"
! BEGIN
! MENUITEM "About ...", IDM_ABOUT
! END
END
#endif // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////
***************
*** 189,193 ****
// Generated from the TEXTINCLUDE 3 resource.
//
! 1 TYPELIB "CleverTelly.tlb"
/////////////////////////////////////////////////////////////////////////////
--- 320,324 ----
// Generated from the TEXTINCLUDE 3 resource.
//
! CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\CleverTelly.exe.manifest"
/////////////////////////////////////////////////////////////////////////////
Index: MSVidCtlComp.cpp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/MSVidCtlComp.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MSVidCtlComp.cpp 13 Feb 2003 17:26:46 -0000 1.3
--- MSVidCtlComp.cpp 24 Feb 2003 17:01:35 -0000 1.4
***************
*** 26,36 ****
_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} };
--- 26,36 ----
_ATL_FUNC_INFO OnClickInfo = {CC_STDCALL, VT_EMPTY, 0};
_ATL_FUNC_INFO OnDblClickInfo = {CC_STDCALL, VT_EMPTY, 0};
! _ATL_FUNC_INFO OnErrorInfo = {CC_STDCALL, VT_EMPTY, 7, {VT_I2, VT_PTR, VT_I4, VT_BSTR, VT_BSTR, VT_I4, VT_PTR} };
! _ATL_FUNC_INFO OnKeyDownInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR, VT_I2} };
! _ATL_FUNC_INFO OnKeyPressInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR} };
! _ATL_FUNC_INFO OnKeyUpInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR, VT_I2} };
! _ATL_FUNC_INFO OnMouseDownInfo = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
! _ATL_FUNC_INFO OnMouseMoveInfo = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
! _ATL_FUNC_INFO OnMouseUpInfo = {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} };
***************
*** 41,88 ****
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)
{
! 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));
!
! hr = GetDlgControl(IDC_MSVIDCTL2, __uuidof(IMSVidCtl), reinterpret_cast<void **>(&m_pVidControl2));
!
! ResizeVideoControl();
! return hr;
! }
- void CMSVidCtlComp::ResizeVideoControl()
- {
- CComQIPtr<IOleInPlaceObject> pInPlaceObject(m_pVidControl);
- if(pInPlaceObject != NULL)
- {
- RECT WinRect;
- GetWindowRect(&WinRect);
- ScreenToClient(&WinRect);
- pInPlaceObject->SetObjectRects(&WinRect, &WinRect);
}
}
LRESULT CMSVidCtlComp::OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
--- 41,81 ----
CMSVidCtlComp::CMSVidCtlComp()
{
}
! void CMSVidCtlComp::ResizeVideoControl()
{
! RECT WinRect;
! CWindow hwndVC(GetDlgItem(IDC_MSVIDCTL1));
! GetWindowRect(&WinRect);
! ScreenToClient(&WinRect);
! hwndVC.MoveWindow(&WinRect, TRUE);
}
! HWND CMSVidCtlComp::Create(HWND hWndParent, RECT& rcPos, LPCTSTR szWindowName,
! DWORD dwStyle, DWORD dwExStyle,UINT nID, LPVOID lpCreateParam)
{
! HWND hWnd = CWindowImpl<CMSVidCtlComp>::Create(hWndParent, rcPos, szWindowName, dwStyle, dwExStyle, nID, lpCreateParam);
! if(hWnd != NULL)
! {
! CComPtr<IUnknown> Container;
! CComPtr<IUnknown> Control;
! AtlAxCreateControlEx(
! L"{B0EDF163-910A-11D2-B632-00C04F79498E}",
! hWnd,
! NULL,
! &Container,
! &Control,
! DIID__IMSVidCtlEvents,
! (IDispatch*)(IMSVidCtlComp*)this
! );
! m_pVidControl = Control;
}
+ return hWnd;
}
+
LRESULT CMSVidCtlComp::OnSysCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
***************
*** 138,186 ****
}
! 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)
{
}
--- 131,171 ----
}
! void __stdcall CMSVidCtlComp::OnClick()
{
}
! void __stdcall CMSVidCtlComp::OnStateChange(MSVidCtlStateList PrevState, MSVidCtlStateList CurrState)
{
}
! void __stdcall CMSVidCtlComp::OnDblClick()
{
}
! void __stdcall CMSVidCtlComp::OnError(short Number, BSTR* pDescription, long Scode, BSTR Source, BSTR HelpFile, long HelpContext, boolean* pCancelDisplay)
{
}
! void __stdcall CMSVidCtlComp::OnKeyDown(short* pKeyCode, short Shift)
{
}
! void __stdcall CMSVidCtlComp::OnKeyPress(short* pKeyCode)
{
}
! void __stdcall CMSVidCtlComp::OnKeyUp(short* pKeyCode, short Shift)
{
}
! void __stdcall CMSVidCtlComp::OnMouseDown(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
{
}
! void __stdcall CMSVidCtlComp::OnMouseMove(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
{
}
! void __stdcall CMSVidCtlComp::OnMouseUp(short Button, short Shift, OLE_XPOS_PIXELS x, OLE_YPOS_PIXELS y)
{
}
***************
*** 260,263 ****
--- 245,251 ----
//
// $Log$
+ // Revision 1.4 2003/02/24 17:01:35 adcockj
+ // Migrated to WTL and stopped using composite control for hosting
+ //
// Revision 1.3 2003/02/13 17:26:46 adcockj
// Interim Checkin starting to add some basic functionality
Index: MSVidCtlComp.h
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/MSVidCtlComp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MSVidCtlComp.h 13 Feb 2003 13:42:13 -0000 1.2
--- MSVidCtlComp.h 24 Feb 2003 17:01:35 -0000 1.3
***************
*** 26,36 ****
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;
--- 26,36 ----
extern _ATL_FUNC_INFO OnClickInfo;
extern _ATL_FUNC_INFO OnDblClickInfo;
! extern _ATL_FUNC_INFO OnErrorInfo;
! extern _ATL_FUNC_INFO OnKeyDownInfo;
! extern _ATL_FUNC_INFO OnKeyPressInfo;
! extern _ATL_FUNC_INFO OnKeyUpInfo;
! extern _ATL_FUNC_INFO OnMouseDownInfo;
! extern _ATL_FUNC_INFO OnMouseMoveInfo;
! extern _ATL_FUNC_INFO OnMouseUpInfo;
extern _ATL_FUNC_INFO OnStateChangeInfo;
***************
*** 40,60 ****
public CComObjectRootEx<CComSingleThreadModel>,
public IDispatchImpl<IMSVidCtlComp, &IID_IMSVidCtlComp, &LIBID_CLEVERTELLYLib>,
! public CComCompositeControl<CMSVidCtlComp>,
! public IPersistStreamInitImpl<CMSVidCtlComp>,
! public IOleControlImpl<CMSVidCtlComp>,
! public IOleObjectImpl<CMSVidCtlComp>,
! public IOleInPlaceActiveObjectImpl<CMSVidCtlComp>,
! public IViewObjectExImpl<CMSVidCtlComp>,
! public IOleInPlaceObjectWindowlessImpl<CMSVidCtlComp>,
! public IPersistStorageImpl<CMSVidCtlComp>,
! public ISpecifyPropertyPagesImpl<CMSVidCtlComp>,
! public IQuickActivateImpl<CMSVidCtlComp>,
! 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>
--- 40,49 ----
public CComObjectRootEx<CComSingleThreadModel>,
public IDispatchImpl<IMSVidCtlComp, &IID_IMSVidCtlComp, &LIBID_CLEVERTELLYLib>,
! public CWindowImpl<CMSVidCtlComp>,
public IProvideClassInfo2Impl<&CLSID_MSVidCtlComp, NULL, &LIBID_CLEVERTELLYLib>,
! public IDispEventSimpleImpl<IDC_MSVIDCTL, 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>
***************
*** 70,88 ****
COM_INTERFACE_ENTRY(IMSVidCtlComp)
COM_INTERFACE_ENTRY2(IDispatch, IMSVidCtlComp)
- COM_INTERFACE_ENTRY(IViewObjectEx)
- COM_INTERFACE_ENTRY(IViewObject2)
- COM_INTERFACE_ENTRY(IViewObject)
- COM_INTERFACE_ENTRY(IOleInPlaceObjectWindowless)
- COM_INTERFACE_ENTRY(IOleInPlaceObject)
- COM_INTERFACE_ENTRY2(IOleWindow, IOleInPlaceObjectWindowless)
- COM_INTERFACE_ENTRY(IOleInPlaceActiveObject)
- COM_INTERFACE_ENTRY(IOleControl)
- COM_INTERFACE_ENTRY(IOleObject)
- COM_INTERFACE_ENTRY(IPersistStreamInit)
- COM_INTERFACE_ENTRY2(IPersist, IPersistStreamInit)
- COM_INTERFACE_ENTRY(ISpecifyPropertyPages)
- COM_INTERFACE_ENTRY(IQuickActivate)
- COM_INTERFACE_ENTRY(IPersistStorage)
- COM_INTERFACE_ENTRY(IDataObject)
COM_INTERFACE_ENTRY(IProvideClassInfo)
COM_INTERFACE_ENTRY(IProvideClassInfo2)
--- 59,62 ----
***************
*** 93,107 ****
END_COM_MAP()
- BEGIN_PROP_MAP(CMSVidCtlComp)
- PROP_DATA_ENTRY("_cx", m_sizeExtent.cx, VT_UI4)
- PROP_DATA_ENTRY("_cy", m_sizeExtent.cy, VT_UI4)
- // Example entries
- // PROP_ENTRY("Property Description", dispid, clsid)
- // PROP_PAGE(CLSID_StockColorPage)
- END_PROP_MAP()
-
BEGIN_MSG_MAP(CMSVidCtlComp)
- CHAIN_MSG_MAP(CComCompositeControl<CMSVidCtlComp>)
- MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
MESSAGE_HANDLER(WM_SYSCOMMAND, OnSysCommand)
MESSAGE_HANDLER(WM_MOVE, OnMove)
--- 67,71 ----
***************
*** 110,114 ****
END_MSG_MAP()
- 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);
--- 74,77 ----
***************
*** 117,145 ****
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)();
--- 80,98 ----
BEGIN_SINK_MAP(CMSVidCtlComp)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_CLICK, OnClick, &OnClickInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_DBLCLICK, OnDblClick, &OnDblClickInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_ERROREVENT, OnError, &OnErrorInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYDOWN, OnKeyDown, &OnKeyDownInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYPRESS, OnKeyPress, &OnKeyPressInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_KEYUP, OnKeyUp, &OnKeyUpInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEDOWN, OnMouseDown, &OnMouseDownInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEMOVE, OnMouseMove, &OnMouseMoveInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), DISPID_MOUSEUP, OnMouseUp, &OnMouseUpInfo)
! SINK_ENTRY_INFO(IDC_MSVIDCTL, __uuidof(_IMSVidCtlEvents), dispidStateChange, OnStateChange, &OnStateChangeInfo)
END_SINK_MAP()
// IMSVidCtlComp
public:
// IMSVidVideoRendererEvent
STDMETHOD(OverlayUnavailable)();
***************
*** 163,184 ****
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, O...
[truncated message content] |
