From 2f838a3f76b3744d009d0f1fd38881045dfe0284 Mon Sep 17 00:00:00 2001 From: "depstein%netscape.com" Date: Fri, 24 May 2002 20:03:19 +0000 Subject: [PATCH] adding web progress test cases. some minor code cleanup. a=asa for QA checkins that are not part of the default builds git-svn-id: svn://10.0.0.236/trunk@122130 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/qa/testembed/Tests.cpp | 96 +-- mozilla/embedding/qa/testembed/Tests.h | 5 +- mozilla/embedding/qa/testembed/UrlDialog.cpp | 31 + mozilla/embedding/qa/testembed/UrlDialog.h | 2 + mozilla/embedding/qa/testembed/makefile.win | 1 + mozilla/embedding/qa/testembed/nsIWebBrow.cpp | 2 +- mozilla/embedding/qa/testembed/nsIWebBrow.h | 6 +- mozilla/embedding/qa/testembed/nsIWebProg.cpp | 151 ++++ mozilla/embedding/qa/testembed/nsIWebProg.h | 57 ++ mozilla/embedding/qa/testembed/resource.h | 12 +- mozilla/embedding/qa/testembed/testembed.aps | Bin 2746 -> 721 bytes mozilla/embedding/qa/testembed/testembed.dsp | 690 +++++++++--------- mozilla/embedding/qa/testembed/testembed.rc | 22 +- 13 files changed, 641 insertions(+), 434 deletions(-) create mode 100644 mozilla/embedding/qa/testembed/nsIWebProg.cpp create mode 100644 mozilla/embedding/qa/testembed/nsIWebProg.h diff --git a/mozilla/embedding/qa/testembed/Tests.cpp b/mozilla/embedding/qa/testembed/Tests.cpp index 504f98aed79..654b5a3c3c0 100644 --- a/mozilla/embedding/qa/testembed/Tests.cpp +++ b/mozilla/embedding/qa/testembed/Tests.cpp @@ -63,7 +63,7 @@ #include "nsIObserServ.h" #include "nsIFile.h" #include "nsIWebBrow.h" - +#include "nsIWebProg.h" #include "QaUtils.h" #include @@ -224,6 +224,11 @@ BEGIN_MESSAGE_MAP(CTests, CWnd) ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_GETCONTENTDOMWINDOW, OnInterfacesNsiwebbrowser) ON_COMMAND(ID_INTERFACES_NSIWEBBROWSER_NSIWBSETUPSETPROPERTY, OnInterfacesNsiwebbrowser) + ON_COMMAND(ID_INTERFACES_NSIWEBPROGRESS_RUNALLTESTS, OnInterfacesNsiwebprogress) + ON_COMMAND(ID_INTERFACES_NSIWEBPROGRESS_ADDPROGRESSLISTENER, OnInterfacesNsiwebprogress) + ON_COMMAND(ID_INTERFACES_NSIWEBPROGRESS_REMOVEPROGRESSLISTENER, OnInterfacesNsiwebprogress) + ON_COMMAND(ID_INTERFACES_NSIWEBPROGRESS_GETDOMWINDOW, OnInterfacesNsiwebprogress) + //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -254,8 +259,8 @@ void CTests::OnTestsChangeUrl() { char *theUrl = "http://www.aol.com/"; CUrlDialog myDialog; - //nsresult rv; + //nsresult rv; if (!qaWebNav) { @@ -268,37 +273,12 @@ void CTests::OnTestsChangeUrl() QAOutput("Begin Change URL test.", 1); strcpy(theUrl, myDialog.m_urlfield); rv = qaWebNav->LoadURI(NS_ConvertASCIItoUCS2(theUrl).get(), - nsIWebNavigation::LOAD_FLAGS_BYPASS_HISTORY, - nsnull, + nsIWebNavigation::LOAD_FLAGS_NONE, + nsnull, nsnull, nsnull); RvTestResult(rv, "rv LoadURI() test", 1); FormatAndPrintOutput("The url = ", theUrl, 2); - -/* - nsCAutoString uriString; - nsCOMPtr pURI; - // GetcurrentURI() declared in nsIP3PUI.idl - // used with webNav obj in nsP3PObserverHTML.cpp, line 239 - // this will be used as an indep routine to verify the URI load - rv = qaWebNav->GetCurrentURI( getter_AddRefs( pURI ) ); - if(NS_FAILED(rv) || !pURI) - AfxMessageBox("Bad result for GetCurrentURI()."); - - rv = pURI->GetSpec(uriString); - if (NS_FAILED(rv)) - AfxMessageBox("Bad result for GetSpec()."); - - AfxMessageBox("Start URL validation test()."); - if (strcmp(uriString, theUrl) == 0) - { - QAOutput("Url loaded successfully. Test Passed.", 2); - } - else - { - QAOutput("Url didn't load successfully. Test Failed.", 2); - } -*/ QAOutput("End Change URL test.", 1); } else @@ -318,9 +298,6 @@ void CTests::OnTestsGlobalHistory() PRBool theRetVal = PR_FALSE; - //nsresult rv; - - nsCOMPtr myHistory(do_GetService(NS_GLOBALHISTORY_CONTRACTID)); if (!myHistory) @@ -439,22 +416,6 @@ void CTests::OnTestsAddWebProgListener() rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); RvTestResult(rv, "AddWebBrowserListener(). Add Web Prog Lstnr test", 2); - -/* - nsCOMPtr qaIReq(do_QueryInterface(qaWebBrowser)); - nsCOMPtr qaWebProgress(do_GetInterface(qaIReq)); - if (!qaWebProgress) - QAOutput("Didn't get web progress object.", 2); - - nsCOMPtr aListener(do_QueryInterface(qaWebBrowser)); - if (!aListener) - QAOutput("We didn't get nsISupports object.", 2); - nsCOMPtr listener = do_QueryInterface(aListener, &rv); - - nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl)); - rv = qaWebProgress->AddProgressListener(listener); - RvTestResult(rv, "nsIWebProgress::AddProgressListener() test", 2); -*/ } // ********************************************************* @@ -499,8 +460,6 @@ void CTests::OnToolsRemoveGHPage() QAOutput("Could not get the history object.", 2); return; } -// nsCOMPtr myHistory(do_GetInterface(myGHistory)); - if (myDialog.DoModal() == IDOK) { @@ -526,8 +485,6 @@ void CTests::OnToolsRemoveGHPage() void CTests::OnToolsRemoveAllGH() { - //nsresult rv; - nsCOMPtr myGHistory(do_GetService(NS_GLOBALHISTORY_CONTRACTID)); if (!myGHistory) { @@ -547,8 +504,6 @@ void CTests::OnToolsRemoveAllGH() QAOutput("End removal of all pages from the GH file.", 2); - // removeAllPages() - } // *********************************************************************** @@ -704,33 +659,6 @@ void CTests::OnToolsTestYourMethod2() { // place your test code here - // nsIWebProgress test cases - - // get webProg object - nsCOMPtr qaIReq(do_QueryInterface(qaWebBrowser)); - nsCOMPtr qaWebProgress(do_GetInterface(qaIReq)); - if (!qaWebProgress) - QAOutput("Didn't get web progress object.", 2); - else - QAOutput("We got web progress object.", 2); - - // addWebProgListener - nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl)); - rv = qaWebProgress->AddProgressListener(listener, nsIWebProgress::NOTIFY_ALL); - RvTestResult(rv, "nsIWebProgress::AddProgressListener() test", 2); - - // removeWebProgListener - rv = qaWebProgress->RemoveProgressListener(listener); - RvTestResult(rv, "nsIWebProgress::RemoveProgressListener() test", 2); - - // getTheDOMWindow - nsCOMPtr qaDOMWindow; - rv = qaWebProgress->GetDOMWindow(getter_AddRefs(qaDOMWindow)); - if (!qaWebProgress) - QAOutput("Didn't get DOM Window object.", 2); - else - RvTestResult(rv, "nsIWebProgress::GetDOMWindow() test", 2); - } // *********************************************************************** @@ -846,3 +774,9 @@ void CTests::OnInterfacesNsiwebbrowser() CNsIWebBrowser oWebBrowser(qaWebBrowser, qaBrowserImpl); oWebBrowser.OnStartTests(nCommandID); } + +void CTests::OnInterfacesNsiwebprogress() +{ + CnsiWebProg oWebProgress(qaWebBrowser, qaBrowserImpl); + oWebProgress.OnStartTests(nCommandID); +} diff --git a/mozilla/embedding/qa/testembed/Tests.h b/mozilla/embedding/qa/testembed/Tests.h index 09690fba7d8..5499b5577d1 100644 --- a/mozilla/embedding/qa/testembed/Tests.h +++ b/mozilla/embedding/qa/testembed/Tests.h @@ -116,12 +116,14 @@ protected: afx_msg void OnTestsCreateprofile(); afx_msg void OnTestsAddWebProgListener(); afx_msg void OnTestsAddHistoryListener(); + afx_msg void OnTestsRemovehistorylistener(); afx_msg void OnInterfacesNsifile(); afx_msg void OnToolsRemoveGHPage(); afx_msg void OnToolsRemoveAllGH(); afx_msg void OnToolsTestYourMethod(); afx_msg void OnToolsTestYourMethod2(); afx_msg void OnVerifybugs70228(); + afx_msg void OnVerifybugs90195(); afx_msg void OnPasteTest(); afx_msg void OnCopyTest(); afx_msg void OnSelectAllTest(); @@ -135,14 +137,13 @@ protected: afx_msg void OnInterfacesNsidomwindow(); afx_msg void OnInterfacesNsidirectoryservice(); afx_msg void OnInterfacesNsiselection(); - afx_msg void OnVerifybugs90195(); afx_msg void OnInterfacesNsiprofile(); afx_msg void OnInterfacesNsishistory(); - afx_msg void OnTestsRemovehistorylistener(); afx_msg void OnInterfacesNsiwebnav(); afx_msg void OnInterfacesNsiclipboardcommands(); afx_msg void OnInterfacesNsiobserverservice(); afx_msg void OnInterfacesNsiwebbrowser(); + afx_msg void OnInterfacesNsiwebprogress(); //}}AFX_MSG diff --git a/mozilla/embedding/qa/testembed/UrlDialog.cpp b/mozilla/embedding/qa/testembed/UrlDialog.cpp index 1fdf3443f2a..58fdb74f194 100644 --- a/mozilla/embedding/qa/testembed/UrlDialog.cpp +++ b/mozilla/embedding/qa/testembed/UrlDialog.cpp @@ -20,6 +20,7 @@ CUrlDialog::CUrlDialog(CWnd* pParent /*=NULL*/) { //{{AFX_DATA_INIT(CUrlDialog) m_urlfield = _T(""); + m_urlflag = 0; //}}AFX_DATA_INIT } @@ -29,6 +30,7 @@ void CUrlDialog::DoDataExchange(CDataExchange* pDX) CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CUrlDialog) DDX_Text(pDX, IDC_URLFIELD, m_urlfield); + DDX_CBIndex(pDX, IDC_COMBO1, m_urlflag); //}}AFX_DATA_MAP } @@ -36,6 +38,8 @@ void CUrlDialog::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CUrlDialog, CDialog) //{{AFX_MSG_MAP(CUrlDialog) ON_EN_CHANGE(IDC_URLFIELD, OnChangeUrlfield) + ON_EN_CHANGE(IDC_COMBO1, OnChangeUrlfield) + ON_CBN_EDITCHANGE(IDC_COMBO1, OnEditchangeCombo1) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -52,3 +56,30 @@ void CUrlDialog::OnChangeUrlfield() // TODO: Add your control notification handler code here } + +int CUrlDialog::OnEditchangeCombo1() +{ + // TODO: Add your control notification handler code here + + int loadFlag = 0; +/* + if (m_urlflag == NONE); + loadFlag = nsIWebNavigation::LOAD_FLAGS_NONE; + else if (m_urlflag == MASK); + loadFlag = nsIWebNavigation::LOAD_FLAGS_MASK; + else if (m_urlflag == IS_LINK); + loadFlag = nsIWebNavigation::LOAD_FLAGS_IS_LINK; + else if (m_urlflag == BYPASS_HISTORY); + loadFlag = nsIWebNavigation::LOAD_FLAGS_BYPASS_HISTORY; + else if (m_urlflag == REPLACE_HISTORY); + loadFlag = nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY; + else if (m_urlflag == BYPASS_CACHE); + loadFlag = nsIWebNavigation::LOAD_FLAGS_BYPASS_CACHE; + else if (m_urlflag == BYPASS_PROXY); + loadFlag = nsIWebNavigation::LOAD_FLAGS_BYPASS_PROXY; + else if (m_urlflag == CHARSET_CHANGE); + loadFlag = nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE; +*/ + return loadFlag; + +} diff --git a/mozilla/embedding/qa/testembed/UrlDialog.h b/mozilla/embedding/qa/testembed/UrlDialog.h index ab65ae3cf3f..9c365419fe4 100644 --- a/mozilla/embedding/qa/testembed/UrlDialog.h +++ b/mozilla/embedding/qa/testembed/UrlDialog.h @@ -20,6 +20,7 @@ public: //{{AFX_DATA(CUrlDialog) enum { IDD = IDD_URLDIALOG }; CString m_urlfield; + int m_urlflag; //}}AFX_DATA @@ -36,6 +37,7 @@ protected: // Generated message map functions //{{AFX_MSG(CUrlDialog) afx_msg void OnChangeUrlfield(); + afx_msg int OnEditchangeCombo1(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/mozilla/embedding/qa/testembed/makefile.win b/mozilla/embedding/qa/testembed/makefile.win index 69c27f15a2d..99f021c34a5 100644 --- a/mozilla/embedding/qa/testembed/makefile.win +++ b/mozilla/embedding/qa/testembed/makefile.win @@ -90,6 +90,7 @@ OBJS = \ .\$(OBJDIR)\nsIObserServ.obj \ .\$(OBJDIR)\nsIFile.obj \ .\$(OBJDIR)\nsIWebBrow.obj \ + .\$(OBJDIR)\nsIWebProg.obj \ $(NULL) LLIBS= \ diff --git a/mozilla/embedding/qa/testembed/nsIWebBrow.cpp b/mozilla/embedding/qa/testembed/nsIWebBrow.cpp index e9b3d7a1921..afb463f4702 100644 --- a/mozilla/embedding/qa/testembed/nsIWebBrow.cpp +++ b/mozilla/embedding/qa/testembed/nsIWebBrow.cpp @@ -40,7 +40,7 @@ // test cases for nsIWebBrowser and nsIWebBrowserSetup // -#include "stdafx.h" +#include "Stdafx.h" #include "TestEmbed.h" #include "BrowserImpl.h" #include "BrowserFrm.h" diff --git a/mozilla/embedding/qa/testembed/nsIWebBrow.h b/mozilla/embedding/qa/testembed/nsIWebBrow.h index 2322201a56e..53d9c387a8e 100644 --- a/mozilla/embedding/qa/testembed/nsIWebBrow.h +++ b/mozilla/embedding/qa/testembed/nsIWebBrow.h @@ -68,8 +68,6 @@ public: // Mozilla interfaces // nsCOMPtr qaWebBrowser; - nsCOMPtr qaWebBrowserChrome; - nsCOMPtr qaURIContentListener; CBrowserImpl *qaBrowserImpl; // local test methods for nsIWebBrowser @@ -96,13 +94,13 @@ public: private: // Individual interface Objects - + nsCOMPtr qaWebBrowserChrome; + nsCOMPtr qaURIContentListener; // Generated message map functions protected: //{{AFX_MSG(CTests) //}}AFX_MSG - }; #endif //_NSIWEBBROW_H diff --git a/mozilla/embedding/qa/testembed/nsIWebProg.cpp b/mozilla/embedding/qa/testembed/nsIWebProg.cpp new file mode 100644 index 00000000000..7d31ff528d1 --- /dev/null +++ b/mozilla/embedding/qa/testembed/nsIWebProg.cpp @@ -0,0 +1,151 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Netscape Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * David Epstein + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the NPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the NPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +// nsiWebProg.cpp : implementation file +// + +#include "Stdafx.h" +#include "TestEmbed.h" +#include "nsIWebProg.h" +#include "Tests.h" +#include "QaUtils.h" +#include "BrowserFrm.h" +#include "BrowserImpl.h" +#include "BrowserView.h" +#include "domwindow.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// CnsiWebProg + +// constructor for CnsiWebProg +CnsiWebProg::CnsiWebProg(nsIWebBrowser *mWebBrowser, + CBrowserImpl *mpBrowserImpl) +{ + qaWebBrowser = mWebBrowser; + qaBrowserImpl = mpBrowserImpl; +} + +// destructor for CnsiWebProg +CnsiWebProg::~CnsiWebProg() +{ +} + + // nsIWebProgress test cases + + // get webProg object +nsIWebProgress * CnsiWebProg::GetWebProgObject() +{ + nsCOMPtr qaIReq(do_QueryInterface(qaWebBrowser)); + nsCOMPtr qaWebProgress(do_GetInterface(qaIReq)); + if (!qaWebProgress) { + QAOutput("Didn't get web progress object.", 2); + return NULL; + } + else { + QAOutput("We got web progress object.", 1); + return (qaWebProgress); + } +} + +void CnsiWebProg::AddWebProgLstnr() +{ + // addWebProgListener + nsCOMPtr qaWebProgress; + qaWebProgress = GetWebProgObject(); + nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl)); + rv = qaWebProgress->AddProgressListener(listener, nsIWebProgress::NOTIFY_ALL); + RvTestResult(rv, "nsIWebProgress::AddProgressListener() test", 2); +} + +void CnsiWebProg::RemoveWebProgLstnr() +{ + // removeWebProgListener + nsCOMPtr qaWebProgress; + qaWebProgress = GetWebProgObject(); + nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl)); + rv = qaWebProgress->RemoveProgressListener(listener); + RvTestResult(rv, "nsIWebProgress::RemoveProgressListener() test", 2); +} + +void CnsiWebProg::GetTheDOMWindow() +{ + // getTheDOMWindow + nsCOMPtr qaWebProgress; + qaWebProgress = GetWebProgObject(); + nsCOMPtr qaDOMWindow; + rv = qaWebProgress->GetDOMWindow(getter_AddRefs(qaDOMWindow)); + if (!qaWebProgress) + QAOutput("Didn't get DOM Window object.", 2); + else + RvTestResult(rv, "nsIWebProgress::GetDOMWindow() test", 2); +} + +void CnsiWebProg::OnStartTests(UINT nMenuID) +{ + switch(nMenuID) + { + case ID_INTERFACES_NSIWEBPROGRESS_RUNALLTESTS : + RunAllTests(); + break ; + case ID_INTERFACES_NSIWEBPROGRESS_ADDPROGRESSLISTENER : + AddWebProgLstnr(); + break ; + case ID_INTERFACES_NSIWEBPROGRESS_REMOVEPROGRESSLISTENER : + RemoveWebProgLstnr(); + break ; + case ID_INTERFACES_NSIWEBPROGRESS_GETDOMWINDOW : + GetTheDOMWindow(); + break ; + } +} + +void CnsiWebProg::RunAllTests(void) +{ + AddWebProgLstnr(); + RemoveWebProgLstnr(); + GetTheDOMWindow(); +} + +///////////////////////////////////////////////////////////////////////////// +// CnsiWebProg message handlers diff --git a/mozilla/embedding/qa/testembed/nsIWebProg.h b/mozilla/embedding/qa/testembed/nsIWebProg.h new file mode 100644 index 00000000000..21082db16f6 --- /dev/null +++ b/mozilla/embedding/qa/testembed/nsIWebProg.h @@ -0,0 +1,57 @@ +#if !defined(AFX_NSIWEBPROG_H__8024AB8F_6DB3_11D6_9BA5_00C04FA02BE6__INCLUDED_) +#define AFX_NSIWEBPROG_H__8024AB8F_6DB3_11D6_9BA5_00C04FA02BE6__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 +// nsiWebProg.h : header file +// + +#include "BrowserView.h" +#include "BrowserImpl.h" +#include "StdAfx.h" +#include "Tests.h" + +///////////////////////////////////////////////////////////////////////////// +// CnsiWebProg window + +class CBrowserImpl; + +class CnsiWebProg +{ +public: + nsCOMPtr qaWebBrowser; + CBrowserImpl *qaBrowserImpl; + // Construction + CnsiWebProg(nsIWebBrowser *mWebBrowser, + CBrowserImpl *mpBrowserImpl); + nsIWebProgress * GetWebProgObject(); + void AddWebProgLstnr(void); + void RemoveWebProgLstnr(void); + void GetTheDOMWindow(void); + + void OnStartTests(UINT nMenuID); + void RunAllTests(void); + +public: +// Attributes + +// Operations +public: + + +// Implementation +public: + virtual ~CnsiWebProg(); + + // Generated message map functions +protected: + +}; + +///////////////////////////////////////////////////////////////////////////// + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_NSIWEBPROG_H__8024AB8F_6DB3_11D6_9BA5_00C04FA02BE6__INCLUDED_) diff --git a/mozilla/embedding/qa/testembed/resource.h b/mozilla/embedding/qa/testembed/resource.h index b48a7dce707..379a4486073 100644 --- a/mozilla/embedding/qa/testembed/resource.h +++ b/mozilla/embedding/qa/testembed/resource.h @@ -43,6 +43,8 @@ #define IDC_PPD_DOC_TITLE_STATIC 1021 #define IDC_ENTER_URLTEXT 1022 #define IDC_URLFIELD 1023 +#define IDC_COMBO1 1025 +#define IDC_CHECK1 1027 #define IDC_MATCH_WHOLE_WORD 1040 #define IDC_MATCH_CASE 1041 #define IDC_WRAP_AROUND 1042 @@ -207,6 +209,10 @@ #define ID_INTERFACES_NSIWEBBROWSER_SETPARENTURICONTENTLISTENER 32943 #define ID_INTERFACES_NSIWEBBROWSER_GETCONTENTDOMWINDOW 32944 #define ID_INTERFACES_NSIWEBBROWSER_NSIWBSETUPSETPROPERTY 32945 +#define ID_INTERFACES_NSIWEBPROGRESS_RUNALLTESTS 32947 +#define ID_INTERFACES_NSIWEBPROGRESS_ADDPROGRESSLISTENER 32948 +#define ID_INTERFACES_NSIWEBPROGRESS_REMOVEPROGRESSLISTENER 32949 +#define ID_INTERFACES_NSIWEBPROGRESS_GETDOMWINDOW 32950 #define ID_CLIPBOARDCMD_PASTE 42789 #define ID_CLIPBOARDCMD_COPYSELECTION 42790 #define ID_CLIPBOARDCMD_SELECTALL 42791 @@ -222,9 +228,9 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 -#define _APS_NEXT_RESOURCE_VALUE 146 -#define _APS_NEXT_COMMAND_VALUE 32946 -#define _APS_NEXT_CONTROL_VALUE 1025 +#define _APS_NEXT_RESOURCE_VALUE 147 +#define _APS_NEXT_COMMAND_VALUE 32951 +#define _APS_NEXT_CONTROL_VALUE 1028 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/mozilla/embedding/qa/testembed/testembed.aps b/mozilla/embedding/qa/testembed/testembed.aps index 52786679c50dbda19ff8f1c38c1a19363cbff6e0..aaa9d676c1bb8323d3d59751fde3ebf2c3f7708d 100644 GIT binary patch literal 721 zcmZ9JT~FIE7=;fK`(Phzz}Uv!khn%klR~?j$*J8gB5^9)QM)OURoV!UTB^0(&3+;O zsEYsGWALi@K)K3f$nD=_Uv(fip6H`*P@VL8SY}Q&J`P4e*?Xcg gtj%g25Mh6*i?0Q;b5yK>6U#c)y%H`5tZ;ky54domQUCw| literal 2746 zcmc&#y-yow7=IuhT!;+n(D@1-h|-dVwo=liP+rGIy<%icLnS23@f~0ZY-%69Q^jz@ zN%u-ccGWV(1@@OJ&Z?|X-hiAbdkedOn!@2~gEL_``ejunEv z1>ZsX3|OR>^gU=CPbBt_G6_Tf{7uBZ-8pRi);Kt*RXgo^%I}zmuS~;eH1~FXsqI*1 z$C8R6x7e-|O(W6QzzXGQ8{airr&ZEvix@P+nqSTiYqrf!>$qJv7x#%id2jqAJcvf) z=NrxX!Lea#bG2Ou$rktLrr`1irn|qD2X|8$=5C{DYSon&+tu|_b#p^st5ovkYB|4I z+A6Q+H>c*uTuOTW9&4q%viifl@f+pRM!sD6c_hiyd}CMpRMjySL@R0eD%15x+R2GF zYOJi33)TGk)*}%IgI0aHw*J-9l)kcF*jg#%wdbE}Pp9UO+O@sInpSTaX7#AHXD&Ql z`eq3+X462qCr^^7;c8+jZ|&~VoCY_o*=m0AW24?~by~ZY_EV#CTszQKA3xSiqhXnb zmTqSU?Tl?qyN(nIAk(H*YZ|q-fu0VJT1~TQAx5@?{ky_OYuKPTesFVAM|XVzHep`| zPEc}y)!~3<99$y&$aNLL7cBL9Jy2l~S4NOn5q#Ax67+pApsaFnsS9R+JW?U@cBLp4 zJd%nCT0oXZ(Uo8lnQ~W(jS|h7E3B|b$|LnlMByb>Lz+$UDUXQGE|d7KtMYKsS`?v4 zC~^^(y$Vq(WX}UR0u(%%X%H%Vq-Gj~p-{M@Havs~#hL0QtHdx&ddh@h5QKWDN4ZO= zD5D3u9)v7N-IbnQ|GCfIeB z%#;zq0^|sB>`CE9F%+f8s0c+WqVN9|7VwN|=s?|ryRVP?cS&B|32ug?U{ z&MHalfmr!x_{Y#d<9KqIgNFZPVlOs;9|P09_)BdWG~?jDb1%eu)Wf@kD)NUycitra z;b1#sIpQ%H;;GF&X5ZG^qkg`$`7a7i!7m8jrNmo_iNFi8ScQ8|kr#z>`gK+i&Mg_H zc+O=pzsS#>BEEps&o32h+p*D$?{M2LiG&{aM1L~Y%}TzB!#Q2JeSUOa_MGVd^79AA4~u{781C#qEZ4lBBNz$(Aa-Xs*3 z8<2}(^ApFvINg_ia8=f#A|rz5_|`eMph49%->6s0qdD0fmgP;_Uuqkr-micDZb$`A Qc6QV<#_xrpT;&_}zk!OP?*IS* diff --git a/mozilla/embedding/qa/testembed/testembed.dsp b/mozilla/embedding/qa/testembed/testembed.dsp index 75582475f03..80e84cf2eae 100644 --- a/mozilla/embedding/qa/testembed/testembed.dsp +++ b/mozilla/embedding/qa/testembed/testembed.dsp @@ -1,337 +1,353 @@ -# Microsoft Developer Studio Project File - Name="testembed" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=testembed - Win32 Debug -!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 "testembed.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 "testembed.mak" CFG="testembed - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "testembed - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "testembed - Win32 Debug" (based on "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "testembed - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Cmd_Line "NMAKE /f testembed.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "testembed.exe" -# PROP BASE Bsc_Name "testembed.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Cmd_Line "nmake /f "makfile.win"" -# PROP Rebuild_Opt "/a" -# PROP Target_File "WIN32_O.OBJ\testembed.exe" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "testembed - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Cmd_Line "NMAKE /f testembed.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "testembed.exe" -# PROP BASE Bsc_Name "testembed.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Cmd_Line "nmake /f "makefile.win"" -# PROP Rebuild_Opt "/a" -# PROP Target_File "WIN32_D.OBJ\testembed.exe" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "testembed - Win32 Release" -# Name "testembed - Win32 Debug" - -!IF "$(CFG)" == "testembed - Win32 Release" - -!ELSEIF "$(CFG)" == "testembed - Win32 Debug" - -!ENDIF - -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\BrowserFrameGlue.cpp -# End Source File -# Begin Source File - -SOURCE=.\BrowserFrm.cpp -# End Source File -# Begin Source File - -SOURCE=.\BrowserImpl.cpp -# End Source File -# Begin Source File - -SOURCE=.\BrowserImplCtxMenuLstnr.cpp -# End Source File -# Begin Source File - -SOURCE=.\BrowserImplHistoryLstnr.cpp -# End Source File -# Begin Source File - -SOURCE=.\BrowserImplPrompt.cpp -# End Source File -# Begin Source File - -SOURCE=.\BrowserImplWebPrgrsLstnr.cpp -# End Source File -# Begin Source File - -SOURCE=.\BrowserView.cpp -# End Source File -# Begin Source File - -SOURCE=.\Dialogs.cpp -# End Source File -# Begin Source File - -SOURCE=.\DomWindow.cpp -# End Source File -# Begin Source File - -SOURCE=.\MostRecentUrls.cpp -# End Source File -# Begin Source File - -SOURCE=.\nsIClipboardCmd.cpp -# End Source File -# Begin Source File - -SOURCE=.\nsiDirServ.cpp -# End Source File -# Begin Source File - -SOURCE=.\nsiHistory.cpp -# End Source File -# Begin Source File - -SOURCE=.\nsIObserServ.cpp -# End Source File -# Begin Source File - -SOURCE=.\nsIRequest.cpp -# End Source File -# Begin Source File - -SOURCE=.\nsIWebNav.cpp -# End Source File -# Begin Source File - -SOURCE=.\nsProfile.cpp -# End Source File -# Begin Source File - -SOURCE=.\Preferences.cpp -# End Source File -# Begin Source File - -SOURCE=.\PrintProgressDialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\ProfileMgr.cpp -# End Source File -# Begin Source File - -SOURCE=.\ProfilesDlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\QaUtils.cpp -# End Source File -# Begin Source File - -SOURCE=.\Selection.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# End Source File -# Begin Source File - -SOURCE=.\TestEmbed.cpp -# End Source File -# Begin Source File - -SOURCE=.\testembed.rc -# End Source File -# Begin Source File - -SOURCE=.\Tests.cpp -# End Source File -# Begin Source File - -SOURCE=.\UrlDialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\winEmbedFileLocProvider.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\BrowserFrm.h -# End Source File -# Begin Source File - -SOURCE=.\BrowserImpl.h -# End Source File -# Begin Source File - -SOURCE=.\BrowserView.h -# End Source File -# Begin Source File - -SOURCE=.\Dialogs.h -# End Source File -# Begin Source File - -SOURCE=.\DomWindow.h -# End Source File -# Begin Source File - -SOURCE=.\IBrowserFrameGlue.h -# End Source File -# Begin Source File - -SOURCE=.\MostRecentUrls.h -# End Source File -# Begin Source File - -SOURCE=.\nsIClipboardCmd.h -# End Source File -# Begin Source File - -SOURCE=.\nsiDirServ.h -# End Source File -# Begin Source File - -SOURCE=.\nsIFile.h -# End Source File -# Begin Source File - -SOURCE=.\nsiHistory.h -# End Source File -# Begin Source File - -SOURCE=.\nsIObserServ.h -# End Source File -# Begin Source File - -SOURCE=.\nsIRequest.h -# End Source File -# Begin Source File - -SOURCE=.\nsIWebNav.h -# End Source File -# Begin Source File - -SOURCE=.\nsProfile.h -# End Source File -# Begin Source File - -SOURCE=.\Preferences.h -# End Source File -# Begin Source File - -SOURCE=.\PrintProgressDialog.h -# End Source File -# Begin Source File - -SOURCE=.\ProfileMgr.h -# End Source File -# Begin Source File - -SOURCE=.\ProfilesDlg.h -# End Source File -# Begin Source File - -SOURCE=.\QaUtils.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\Selection.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=.\TestEmbed.h -# End Source File -# Begin Source File - -SOURCE=.\Tests.h -# End Source File -# Begin Source File - -SOURCE=.\UrlDialog.h -# End Source File -# Begin Source File - -SOURCE=.\winEmbedFileLocProvider.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" -# Begin Source File - -SOURCE=.\res\testembed.ico -# End Source File -# Begin Source File - -SOURCE=.\res\testembed.ico -# End Source File -# Begin Source File - -SOURCE=.\res\Toolbar.bmp -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="testembed" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=testembed - Win32 Debug +!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 "testembed.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 "testembed.mak" CFG="testembed - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "testembed - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "testembed - Win32 Debug" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "testembed - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Cmd_Line "NMAKE /f testembed.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "testembed.exe" +# PROP BASE Bsc_Name "testembed.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Cmd_Line "nmake /f "makfile.win"" +# PROP Rebuild_Opt "/a" +# PROP Target_File "WIN32_O.OBJ\testembed.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "testembed - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Cmd_Line "NMAKE /f testembed.mak" +# PROP BASE Rebuild_Opt "/a" +# PROP BASE Target_File "testembed.exe" +# PROP BASE Bsc_Name "testembed.bsc" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Cmd_Line "nmake /f "makefile.win"" +# PROP Rebuild_Opt "/a" +# PROP Target_File "WIN32_D.OBJ\testembed.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "testembed - Win32 Release" +# Name "testembed - Win32 Debug" + +!IF "$(CFG)" == "testembed - Win32 Release" + +!ELSEIF "$(CFG)" == "testembed - Win32 Debug" + +!ENDIF + +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\BrowserFrameGlue.cpp +# End Source File +# Begin Source File + +SOURCE=.\BrowserFrm.cpp +# End Source File +# Begin Source File + +SOURCE=.\BrowserImpl.cpp +# End Source File +# Begin Source File + +SOURCE=.\BrowserImplCtxMenuLstnr.cpp +# End Source File +# Begin Source File + +SOURCE=.\BrowserImplHistoryLstnr.cpp +# End Source File +# Begin Source File + +SOURCE=.\BrowserImplPrompt.cpp +# End Source File +# Begin Source File + +SOURCE=.\BrowserImplWebPrgrsLstnr.cpp +# End Source File +# Begin Source File + +SOURCE=.\BrowserView.cpp +# End Source File +# Begin Source File + +SOURCE=.\Dialogs.cpp +# End Source File +# Begin Source File + +SOURCE=.\DomWindow.cpp +# End Source File +# Begin Source File + +SOURCE=.\MostRecentUrls.cpp +# End Source File +# Begin Source File + +SOURCE=.\nsIClipboardCmd.cpp +# End Source File +# Begin Source File + +SOURCE=.\nsiDirServ.cpp +# End Source File +# Begin Source File + +SOURCE=.\nsiHistory.cpp +# End Source File +# Begin Source File + +SOURCE=.\nsIObserServ.cpp +# End Source File +# Begin Source File + +SOURCE=.\nsIRequest.cpp +# End Source File +# Begin Source File + +SOURCE=.\nsIWebBrow.cpp +# End Source File +# Begin Source File + +SOURCE=.\nsIWebNav.cpp +# End Source File +# Begin Source File + +SOURCE=.\nsiWebProg.cpp +# End Source File +# Begin Source File + +SOURCE=.\nsProfile.cpp +# End Source File +# Begin Source File + +SOURCE=.\Preferences.cpp +# End Source File +# Begin Source File + +SOURCE=.\PrintProgressDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\ProfileMgr.cpp +# End Source File +# Begin Source File + +SOURCE=.\ProfilesDlg.cpp +# End Source File +# Begin Source File + +SOURCE=.\QaUtils.cpp +# End Source File +# Begin Source File + +SOURCE=.\Selection.cpp +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.cpp +# End Source File +# Begin Source File + +SOURCE=.\TestEmbed.cpp +# End Source File +# Begin Source File + +SOURCE=.\testembed.rc +# End Source File +# Begin Source File + +SOURCE=.\Tests.cpp +# End Source File +# Begin Source File + +SOURCE=.\UrlDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\winEmbedFileLocProvider.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\BrowserFrm.h +# End Source File +# Begin Source File + +SOURCE=.\BrowserImpl.h +# End Source File +# Begin Source File + +SOURCE=.\BrowserView.h +# End Source File +# Begin Source File + +SOURCE=.\Dialogs.h +# End Source File +# Begin Source File + +SOURCE=.\DomWindow.h +# End Source File +# Begin Source File + +SOURCE=.\IBrowserFrameGlue.h +# End Source File +# Begin Source File + +SOURCE=.\MostRecentUrls.h +# End Source File +# Begin Source File + +SOURCE=.\nsIClipboardCmd.h +# End Source File +# Begin Source File + +SOURCE=.\nsiDirServ.h +# End Source File +# Begin Source File + +SOURCE=.\nsIFile.h +# End Source File +# Begin Source File + +SOURCE=.\nsiHistory.h +# End Source File +# Begin Source File + +SOURCE=.\nsIObserServ.h +# End Source File +# Begin Source File + +SOURCE=.\nsIRequest.h +# End Source File +# Begin Source File + +SOURCE=.\nsIWebBrow.h +# End Source File +# Begin Source File + +SOURCE=.\nsIWebNav.h +# End Source File +# Begin Source File + +SOURCE=.\nsiWebProg.h +# End Source File +# Begin Source File + +SOURCE=.\nsProfile.h +# End Source File +# Begin Source File + +SOURCE=.\Preferences.h +# End Source File +# Begin Source File + +SOURCE=.\PrintProgressDialog.h +# End Source File +# Begin Source File + +SOURCE=.\ProfileMgr.h +# End Source File +# Begin Source File + +SOURCE=.\ProfilesDlg.h +# End Source File +# Begin Source File + +SOURCE=.\QaUtils.h +# End Source File +# Begin Source File + +SOURCE=.\resource.h +# End Source File +# Begin Source File + +SOURCE=.\Selection.h +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.h +# End Source File +# Begin Source File + +SOURCE=.\TestEmbed.h +# End Source File +# Begin Source File + +SOURCE=.\Tests.h +# End Source File +# Begin Source File + +SOURCE=.\UrlDialog.h +# End Source File +# Begin Source File + +SOURCE=.\winEmbedFileLocProvider.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" +# Begin Source File + +SOURCE=.\res\testembed.ico +# End Source File +# Begin Source File + +SOURCE=.\res\testembed.ico +# End Source File +# Begin Source File + +SOURCE=.\res\Toolbar.bmp +# End Source File +# End Group +# End Target +# End Project diff --git a/mozilla/embedding/qa/testembed/testembed.rc b/mozilla/embedding/qa/testembed/testembed.rc index d10395fa49e..bb46de5f7f3 100644 --- a/mozilla/embedding/qa/testembed/testembed.rc +++ b/mozilla/embedding/qa/testembed/testembed.rc @@ -468,6 +468,17 @@ BEGIN MENUITEM "nsIWBSetup->SetProperty", ID_INTERFACES_NSIWEBBROWSER_NSIWBSETUPSETPROPERTY END + POPUP "nsIWebProgress" + BEGIN + MENUITEM "Run All Tests", ID_INTERFACES_NSIWEBPROGRESS_RUNALLTESTS + + MENUITEM "AddProgressListener", ID_INTERFACES_NSIWEBPROGRESS_ADDPROGRESSLISTENER + + MENUITEM "RemoveProgressListener", ID_INTERFACES_NSIWEBPROGRESS_REMOVEPROGRESSLISTENER + + MENUITEM "GetDOMWindow", ID_INTERFACES_NSIWEBPROGRESS_GETDOMWINDOW + + END END POPUP "T&ools" BEGIN @@ -731,10 +742,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "URL Dialog" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 - LTEXT "Enter URL here:",IDC_ENTER_URLTEXT,65,48,69,8 - EDITTEXT IDC_URLFIELD,30,66,132,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,131,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,131,22,50,14 + LTEXT "Enter URL here:",IDC_ENTER_URLTEXT,64,55,71,8 + EDITTEXT IDC_URLFIELD,25,68,134,14,ES_AUTOHSCROLL END IDD_RUNTESTSDLG DIALOG DISCARDABLE 0, 0, 331, 186 @@ -841,8 +852,7 @@ BEGIN IDD_URLDIALOG, DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 + LEFTMARGIN, 6 TOPMARGIN, 7 BOTTOMMARGIN, 88 END