From cbc1e28355a62a5ee3a9488b4672e88eaec344e2 Mon Sep 17 00:00:00 2001 From: "locka%iol.ie" Date: Tue, 21 Mar 2000 22:40:48 +0000 Subject: [PATCH] Tests folder moved git-svn-id: svn://10.0.0.236/trunk@63634 18797224-902f-48f8-a5cc-f745e15eee43 --- .../ActiveX/tests/IEPatcher/IEPatcher.dsp | 13 +- .../ActiveX/tests/RegMozCtl/RegMozCtlDlg.cpp | 12 + .../ActiveX/tests/RegMozCtl/RegMozCtlDlg.h | 3 +- .../ActiveX/tests/cbrowse/CBrowseDlg.cpp | 13 +- .../embed/ActiveX/tests/cbrowse/CBrowseDlg.h | 1 + .../tests/cbrowse/ControlEventSink.cpp | 4 +- .../embed/ActiveX/tests/cbrowse/cbrowse.cpp | 205 ------------------ .../embed/ActiveX/tests/cbrowse/cbrowse.rc | 1 + .../embed/ActiveX/tests/cbrowse/resource.h | 3 +- 9 files changed, 40 insertions(+), 215 deletions(-) delete mode 100644 mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.cpp diff --git a/mozilla/webshell/embed/ActiveX/tests/IEPatcher/IEPatcher.dsp b/mozilla/webshell/embed/ActiveX/tests/IEPatcher/IEPatcher.dsp index 46b76e55432..53b943b34f4 100644 --- a/mozilla/webshell/embed/ActiveX/tests/IEPatcher/IEPatcher.dsp +++ b/mozilla/webshell/embed/ActiveX/tests/IEPatcher/IEPatcher.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="IEPatcher" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 @@ -22,6 +22,7 @@ CFG=IEPatcher - Win32 Debug !MESSAGE # Begin Project +# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe @@ -43,8 +44,8 @@ RSC=rc.exe # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x1809 /d "NDEBUG" /d "_AFXDLL" # ADD RSC /l 0x1809 /d "NDEBUG" BSC32=bscmake.exe @@ -67,9 +68,9 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x1809 /d "_DEBUG" /d "_AFXDLL" # ADD RSC /l 0x1809 /d "_DEBUG" BSC32=bscmake.exe diff --git a/mozilla/webshell/embed/ActiveX/tests/RegMozCtl/RegMozCtlDlg.cpp b/mozilla/webshell/embed/ActiveX/tests/RegMozCtl/RegMozCtlDlg.cpp index a11fb075e7d..c24d85c4bb1 100644 --- a/mozilla/webshell/embed/ActiveX/tests/RegMozCtl/RegMozCtlDlg.cpp +++ b/mozilla/webshell/embed/ActiveX/tests/RegMozCtl/RegMozCtlDlg.cpp @@ -323,3 +323,15 @@ void CRegMozCtlDlg::OnAutomatic() m_edtComponentPath.EnableWindow(!m_bAutomatic); m_btnPickComponentPath.EnableWindow(!m_bAutomatic); } + +CString CRegMozCtlDlg::GetSystemPath() +{ + // TODO + return _T(""); +} + +BOOL CRegMozCtlDlg::SetSystemPath(const CString &szNewPath) +{ + // TODO + return TRUE; +} diff --git a/mozilla/webshell/embed/ActiveX/tests/RegMozCtl/RegMozCtlDlg.h b/mozilla/webshell/embed/ActiveX/tests/RegMozCtl/RegMozCtlDlg.h index 9bea4747b42..617df382aaf 100644 --- a/mozilla/webshell/embed/ActiveX/tests/RegMozCtl/RegMozCtlDlg.h +++ b/mozilla/webshell/embed/ActiveX/tests/RegMozCtl/RegMozCtlDlg.h @@ -55,7 +55,8 @@ protected: DECLARE_MESSAGE_MAP() void RegisterMozillaControl(BOOL bRegister); - + BOOL SetSystemPath(const CString &szNewPath); + CString GetSystemPath(); }; //{{AFX_INSERT_LOCATION}} diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/CBrowseDlg.cpp b/mozilla/webshell/embed/ActiveX/tests/cbrowse/CBrowseDlg.cpp index 9654ecb5168..a2cc0fbe3d8 100644 --- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/CBrowseDlg.cpp +++ b/mozilla/webshell/embed/ActiveX/tests/cbrowse/CBrowseDlg.cpp @@ -93,6 +93,7 @@ BEGIN_MESSAGE_MAP(CBrowseDlg, CDialog) ON_UPDATE_COMMAND_UI(ID_VIEW_GOTO_BACK, OnUpdateViewGotoBack) ON_UPDATE_COMMAND_UI(ID_VIEW_GOTO_FORWARD, OnUpdateViewGotoForward) ON_COMMAND(ID_EDIT_SELECTALL, OnEditSelectAll) + ON_COMMAND(ID_VIEW_REFRESH, OnViewRefresh) //}}AFX_MSG_MAP ON_COMMAND(IDB_BOLD, OnEditBold) ON_COMMAND(IDB_ITALIC, OnEditItalic) @@ -778,6 +779,17 @@ void CBrowseDlg::OnFileExit() OnClose(); } +void CBrowseDlg::OnViewRefresh() +{ + IWebBrowser *pIWebBrowser = NULL; + if (SUCCEEDED(GetWebBrowser(&pIWebBrowser))) + { + CComVariant vValue(REFRESH_COMPLETELY); + pIWebBrowser->Refresh2(&vValue); + pIWebBrowser->Release(); + } +} + void CBrowseDlg::OnViewGotoBack() { OnBackward(); @@ -832,4 +844,3 @@ void CBrowseDlg::OnHelpAbout() { AfxMessageBox(_T("CBrowse - Browser Control Test Harness")); } - diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/CBrowseDlg.h b/mozilla/webshell/embed/ActiveX/tests/cbrowse/CBrowseDlg.h index 9512196e7d9..6fc9c31d056 100644 --- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/CBrowseDlg.h +++ b/mozilla/webshell/embed/ActiveX/tests/cbrowse/CBrowseDlg.h @@ -95,6 +95,7 @@ protected: afx_msg void OnUpdateViewGotoBack(CCmdUI* pCmdUI); afx_msg void OnUpdateViewGotoForward(CCmdUI* pCmdUI); afx_msg void OnEditSelectAll(); + afx_msg void OnViewRefresh(); //}}AFX_MSG afx_msg void OnEditBold(); afx_msg void OnEditItalic(); diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/ControlEventSink.cpp b/mozilla/webshell/embed/ActiveX/tests/cbrowse/ControlEventSink.cpp index 2a9ff739bf4..f8b6f898c43 100644 --- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/ControlEventSink.cpp +++ b/mozilla/webshell/embed/ActiveX/tests/cbrowse/ControlEventSink.cpp @@ -79,7 +79,9 @@ HRESULT STDMETHODCALLTYPE CControlEventSink:: Invoke( szEvent = _T("PropertyChange"); break; case 0xfa: - szEvent = _T("BeforeNavigate2"); + { + szEvent = _T("BeforeNavigate2"); + } break; case 0xfb: { diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.cpp b/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.cpp deleted file mode 100644 index 33c506458e4..00000000000 --- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.cpp +++ /dev/null @@ -1,205 +0,0 @@ -// cbrowse.cpp : Defines the class behaviors for the application. -// - -#include "stdafx.h" -#include "cbrowse.h" -#include "PickerDlg.h" -#include -#include "Cbrowse_i.c" -#include "TestScriptHelper.h" -#include "ControlEventSink.h" -#include "CBrowserCtlSite.h" - - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CBrowseApp - -BEGIN_MESSAGE_MAP(CBrowseApp, CWinApp) - //{{AFX_MSG_MAP(CBrowseApp) - // NOTE - the ClassWizard will add and remove mapping macros here. - // DO NOT EDIT what you see in these blocks of generated code! - //}}AFX_MSG - ON_COMMAND(ID_HELP, CWinApp::OnHelp) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CBrowseApp construction - -CBrowseApp::CBrowseApp() -{ - // TODO: add construction code here, - // Place all significant initialization in InitInstance -} - -///////////////////////////////////////////////////////////////////////////// -// The one and only CBrowseApp object - -CBrowseApp theApp; - -///////////////////////////////////////////////////////////////////////////// -// CBrowseApp initialization - -BOOL CBrowseApp::InitInstance() -{ - // Initialize OLE libraries - if (!AfxOleInit()) - { - return FALSE; - } - if (!InitATL()) - return FALSE; - - AfxEnableControlContainer(); - _Module.RegisterClassObjects(CLSCTX_LOCAL_SERVER, - REGCLS_MULTIPLEUSE); - - - // Standard initialization - // If you are not using these features and wish to reduce the size - // of your final executable, you should remove from the following - // the specific initialization routines you do not need. - -#ifdef _AFXDLL - Enable3dControls(); // Call this when using MFC in a shared DLL -#else - Enable3dControlsStatic(); // Call this when linking to MFC statically -#endif - - int nResponse; - - CPickerDlg pickerDlg; - nResponse = pickerDlg.DoModal(); - if (nResponse != IDOK) - { - return FALSE; - } - - m_pDlg = new CBrowseDlg; - m_pDlg->m_clsid = pickerDlg.m_clsid; - m_pDlg->m_bUseCustomDropTarget = pickerDlg.m_bUseCustom; - m_pDlg->m_bUseCustomPopupMenu = pickerDlg.m_bUseCustom; - m_pDlg->Create(IDD_CBROWSE_DIALOG); - m_pMainWnd = m_pDlg; - - // Since the dialog has been closed, return FALSE so that we exit the - // application, rather than start the application's message pump. - return TRUE; -} - -CBrowseModule _Module; - -BEGIN_OBJECT_MAP(ObjectMap) - OBJECT_ENTRY(CLSID_TestScriptHelper, CTestScriptHelper) -// OBJECT_ENTRY(CLSID_ControlEventSink, CControlEventSink) -// OBJECT_ENTRY(CLSID_CBrowserCtlSite, CCBrowserCtlSite) -END_OBJECT_MAP() - -LONG CBrowseModule::Unlock() -{ - AfxOleUnlockApp(); - return 0; -} - -LONG CBrowseModule::Lock() -{ - AfxOleLockApp(); - return 1; -} - -LPCTSTR CBrowseModule::FindOneOf(LPCTSTR p1, LPCTSTR p2) -{ - while (*p1 != NULL) - { - LPCTSTR p = p2; - while (*p != NULL) - { - if (*p1 == *p) - return CharNext(p1); - p = CharNext(p); - } - p1++; - } - return NULL; -} - - -int CBrowseApp::ExitInstance() -{ - if (m_bATLInited) - { - _Module.RevokeClassObjects(); - _Module.Term(); - CoUninitialize(); - } - return CWinApp::ExitInstance(); -} - - -BOOL CBrowseApp::InitATL() -{ - m_bATLInited = TRUE; - -#if _WIN32_WINNT >= 0x0400 - HRESULT hRes = CoInitializeEx(NULL, COINIT_MULTITHREADED); -#else - HRESULT hRes = CoInitialize(NULL); -#endif - - if (FAILED(hRes)) - { - m_bATLInited = FALSE; - return FALSE; - } - - _Module.Init(ObjectMap, AfxGetInstanceHandle()); - _Module.dwThreadID = GetCurrentThreadId(); - - LPTSTR lpCmdLine = GetCommandLine(); //this line necessary for _ATL_MIN_CRT - TCHAR szTokens[] = _T("-/"); - - BOOL bRun = TRUE; - LPCTSTR lpszToken = _Module.FindOneOf(lpCmdLine, szTokens); - while (lpszToken != NULL) - { - if (lstrcmpi(lpszToken, _T("UnregServer"))==0) - { - _Module.UpdateRegistryFromResource(IDR_CBROWSE, FALSE); - _Module.UnregisterServer(TRUE); //TRUE means typelib is unreg'd - bRun = FALSE; - break; - } - if (lstrcmpi(lpszToken, _T("RegServer"))==0) - { - _Module.UpdateRegistryFromResource(IDR_CBROWSE, TRUE); - _Module.RegisterServer(TRUE); - bRun = FALSE; - break; - } - lpszToken = _Module.FindOneOf(lpszToken, szTokens); - } - - if (!bRun) - { - m_bATLInited = FALSE; - _Module.Term(); - CoUninitialize(); - return FALSE; - } - - hRes = _Module.RegisterClassObjects(CLSCTX_LOCAL_SERVER, - REGCLS_MULTIPLEUSE); - if (FAILED(hRes)) - { - m_bATLInited = FALSE; - CoUninitialize(); - return FALSE; - } - - return TRUE; -} diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.rc b/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.rc index d170c19b046..9b7fbadefca 100644 --- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.rc +++ b/mozilla/webshell/embed/ActiveX/tests/cbrowse/cbrowse.rc @@ -221,6 +221,7 @@ BEGIN MENUITEM "&Home Page", ID_VIEW_GOTO_HOME END MENUITEM "&Stop", ID_VIEW_STOP + MENUITEM "&Refresh", ID_VIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Sour&ce", ID_VIEW_VIEWSOURCE END diff --git a/mozilla/webshell/embed/ActiveX/tests/cbrowse/resource.h b/mozilla/webshell/embed/ActiveX/tests/cbrowse/resource.h index e67e146763b..cffde5ba3ff 100644 --- a/mozilla/webshell/embed/ActiveX/tests/cbrowse/resource.h +++ b/mozilla/webshell/embed/ActiveX/tests/cbrowse/resource.h @@ -61,13 +61,14 @@ #define ID_VIEW_STOP 32788 #define ID_VIEW_GOTO_HOME 32789 #define ID_EDIT_SELECTALL 32790 +#define ID_VIEW_REFRESH 32791 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 142 -#define _APS_NEXT_COMMAND_VALUE 32791 +#define _APS_NEXT_COMMAND_VALUE 32792 #define _APS_NEXT_CONTROL_VALUE 1027 #define _APS_NEXT_SYMED_VALUE 107 #endif