From 2cefc3f627534523e23f2b0e9468907689b35599 Mon Sep 17 00:00:00 2001 From: "depstein%netscape.com" Date: Fri, 30 Aug 2002 08:29:25 +0000 Subject: [PATCH] Adding initial test cases for nsICommandParams. Enhanced nsICommandManager cases. a=asa for QA checkins that are not part of the default builds git-svn-id: svn://10.0.0.236/trunk@128535 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/qa/testembed/Makefile.in | 1 + mozilla/embedding/qa/testembed/QaUtils.cpp | 1 + mozilla/embedding/qa/testembed/Tests.cpp | 24 ++ mozilla/embedding/qa/testembed/Tests.h | 9 +- .../embedding/qa/testembed/nsICmdParams.cpp | 266 ++++++++++++++++++ mozilla/embedding/qa/testembed/nsICmdParams.h | 72 +++++ .../embedding/qa/testembed/nsICommandMgr.cpp | 7 +- mozilla/embedding/qa/testembed/resource.h | 20 +- mozilla/embedding/qa/testembed/testembed.rc | 148 ++++++---- 9 files changed, 484 insertions(+), 64 deletions(-) create mode 100644 mozilla/embedding/qa/testembed/nsICmdParams.cpp create mode 100644 mozilla/embedding/qa/testembed/nsICmdParams.h diff --git a/mozilla/embedding/qa/testembed/Makefile.in b/mozilla/embedding/qa/testembed/Makefile.in index f4853c9cfdd..d513078a712 100644 --- a/mozilla/embedding/qa/testembed/Makefile.in +++ b/mozilla/embedding/qa/testembed/Makefile.in @@ -107,6 +107,7 @@ CPPSRCS = \ WebProgDlg.cpp \ nsIEditSession.cpp \ nsICommandMgr.cpp \ + nsICmdParams.cpp \ $(NULL) EXTRA_DSO_LIBS = embed_base_s gkgfx testEmbedComponents diff --git a/mozilla/embedding/qa/testembed/QaUtils.cpp b/mozilla/embedding/qa/testembed/QaUtils.cpp index 5b5095915c2..2553b54298c 100644 --- a/mozilla/embedding/qa/testembed/QaUtils.cpp +++ b/mozilla/embedding/qa/testembed/QaUtils.cpp @@ -213,6 +213,7 @@ void FormatAndPrintOutput(const char *theInput, int theVar, int outputMode) } } + // stringMsg is returned in case embeddor wishes to use it in the calling method. void RequestName(nsIRequest *request, nsCString &stringMsg, int displayMethod) diff --git a/mozilla/embedding/qa/testembed/Tests.cpp b/mozilla/embedding/qa/testembed/Tests.cpp index b083c977c9b..0d0fab38417 100644 --- a/mozilla/embedding/qa/testembed/Tests.cpp +++ b/mozilla/embedding/qa/testembed/Tests.cpp @@ -67,6 +67,7 @@ #include "nsIWebBrowFind.h" #include "nsIEditSession.h" #include "nsICommandMgr.h" +#include "nsICmdParams.h" #include "QaUtils.h" #include @@ -262,6 +263,23 @@ BEGIN_MESSAGE_MAP(CTests, CWnd) ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDENABLED, OnInterfacesNsicommandmgr) ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_GETCOMMANDSTATE, OnInterfacesNsicommandmgr) ON_COMMAND(ID_INTERFACES_NSICOMMANDMANAGER_DOCOMMAND, OnInterfacesNsicommandmgr) + + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_RUNALLTESTS, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETVALUETYPE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETBOOLEANVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETLONGVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETDOUBLEVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETSTRINGVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETISUPPORTSVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETBOOLEANVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETLONGVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETDOUBLEVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETSTRINGVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_SETISUPPORTSVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_REMOVEVALUE, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_HASMOREELEMENTS, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_FIRST, OnInterfacesNsicmdparams) + ON_COMMAND(ID_INTERFACES_NSICOMMANDPARAMS_GETNEXT, OnInterfacesNsicmdparams) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -695,4 +713,10 @@ void CTests::OnInterfacesNsicommandmgr() { CnsICommandMgr oCommandMgr(qaWebBrowser); oCommandMgr.OnStartTests(nCommandID); +} + +void CTests::OnInterfacesNsicmdparams() +{ + CnsICmdParams oCmdParams(qaWebBrowser); + oCmdParams.OnStartTests(nCommandID); } \ No newline at end of file diff --git a/mozilla/embedding/qa/testembed/Tests.h b/mozilla/embedding/qa/testembed/Tests.h index 61cc3d28417..c4df1ec455e 100644 --- a/mozilla/embedding/qa/testembed/Tests.h +++ b/mozilla/embedding/qa/testembed/Tests.h @@ -14,13 +14,13 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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 + * David Epstein * * * Alternatively, the contents of this file may be used under the terms of @@ -68,14 +68,14 @@ public: CBrowserImpl *mpBrowserImpl); virtual ~CTests(); - + // Some helper methods // Mozilla interfaces // nsCOMPtr qaWebBrowser; nsCOMPtr qaBaseWindow; - nsCOMPtr qaWebNav; + nsCOMPtr qaWebNav; CBrowserImpl *qaBrowserImpl; // local test methods @@ -139,6 +139,7 @@ protected: afx_msg void OnInterfacesNsiwebbrowfind(); afx_msg void OnInterfacesNsieditingsession(); afx_msg void OnInterfacesNsicommandmgr(); + afx_msg void OnInterfacesNsicmdparams(); //}}AFX_MSG diff --git a/mozilla/embedding/qa/testembed/nsICmdParams.cpp b/mozilla/embedding/qa/testembed/nsICmdParams.cpp new file mode 100644 index 00000000000..7200c4687cd --- /dev/null +++ b/mozilla/embedding/qa/testembed/nsICmdParams.cpp @@ -0,0 +1,266 @@ +// nsICmdParams.cpp : implementation file +// + +#include "stdafx.h" +#include "testembed.h" +#include "nsICmdParams.h" +#include "QaUtils.h" +#include "BrowserFrm.h" +#include "BrowserImpl.h" +#include "BrowserView.h" +#include "Tests.h" +#include "nsICommandMgr.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// nsICmdParams + +CnsICmdParams::CnsICmdParams(nsIWebBrowser *mWebBrowser) +{ + qaWebBrowser = mWebBrowser; +} + +CnsICmdParams::~CnsICmdParams() +{ +} + +nsICommandParams * CnsICmdParams::GetCommandParamObject() +{ + nsCOMPtr cmdParamsObj = do_CreateInstance(NS_COMMAND_PARAMS_CONTRACTID,&rv); + RvTestResult(rv, "GetCommandParamsObject() test", 1); + if (!cmdParamsObj) { + QAOutput("Didn't get nsICommandParams object."); + return nsnull; + } + nsICommandParams *retVal = cmdParamsObj; + NS_ADDREF(retVal); + return retVal; +} + +nsICommandManager * CnsICmdParams::GetCommandMgrObject() +{ + nsCOMPtr cmdMgrObj = do_GetInterface(qaWebBrowser, &rv); + RvTestResult(rv, "GetCommandMgrObject() test", 1); + if (!cmdMgrObj) { + QAOutput("Didn't get nsICommandManager object."); + return nsnull; + } + return cmdMgrObj; +} + +void CnsICmdParams::GetValueTypeTest(const char *stateType) +{ + PRInt16 retval; + + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) { + cmdMgrObj = GetCommandMgrObject(); + if (!cmdMgrObj) + QAOutput("We didn't get nsICommandMgr object.", 2); + FormatAndPrintOutput("The input state type = ", stateType, 2); + cmdParamObj->SetCStringValue(stateType, "cmd_bold"); +// rv = cmdMgrObj->GetCommandState("cmd_bold",cmdParamObj); +// RvTestResult(rv, "cmdMgrObj->GetCommandState test", 2); + rv = cmdParamObj->GetValueType(stateType, &retval); + RvTestResult(rv, "GetValueType test", 2); + FormatAndPrintOutput("GetValueType return boolean = ", retval, 2); + } + else + QAOutput("GetValueTypeTest(): We didn't get nsICommandParams object.", 1); +} + +void CnsICmdParams::GetBooleanValueTest(const char *stateType) +{ + PRBool retval; + + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) { + FormatAndPrintOutput("The input state type = ", stateType, 2); + cmdParamObj->SetCStringValue(stateType, "cmd_bold"); + cmdMgrObj = GetCommandMgrObject(); + cmdMgrObj->GetCommandState("cmd_bold", cmdParamObj); + rv = cmdParamObj->GetBooleanValue(stateType, &retval); + RvTestResult(rv, "GetBooleanValue test", 2); + FormatAndPrintOutput("GetBooleanValue() return boolean = ", retval, 2); + } + else + QAOutput("GetBooleanValueTest(): We didn't get nsICommandParams object.", 1); +} + +void CnsICmdParams::GetLongValueTest(const char *stateType) +{ + PRInt32 retval; + + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) { + FormatAndPrintOutput("The input state type = ", stateType, 2); + rv = cmdParamObj->GetLongValue(stateType, &retval); + RvTestResult(rv, "GetLongValue test", 2); + FormatAndPrintOutput("GetLongValue() return long = ", retval, 2); + } + else + QAOutput("GetLongValueTest: We didn't get nsICommandParams object.", 1); +} + +void CnsICmdParams::GetDoubleValueTest(const char *stateType) +{ + double retval; + + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) { + FormatAndPrintOutput("The input state type = ", stateType, 2); + rv = cmdParamObj->GetDoubleValue(stateType, &retval); + RvTestResult(rv, "GetDoubleValue test", 2); + FormatAndPrintOutput("GetLongValue() return double = ", retval, 2); + } + else + QAOutput("GetDoubleValueTest: We didn't get nsICommandParams object.", 1); +} + +void CnsICmdParams::GetStringValueTest(const char *stateType) +{ + nsAutoString retval; + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) { + FormatAndPrintOutput("The input state type = ", stateType, 2); + rv = cmdParamObj->GetStringValue(stateType, retval); + RvTestResult(rv, "GetStringValue test", 2); +// FormatAndPrintOutput("GetStringValue() return string = ", retval, 2); + } + else + QAOutput("GetStringValueTest: We didn't get nsICommandParams object.", 1); +} + +// NS_ConvertASCIItoUCS2 + +void CnsICmdParams::SetBooleanValueTest(PRBool value, const char *stateType) +{ + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) { + FormatAndPrintOutput("The input state type = ", stateType, 2); + FormatAndPrintOutput("SetBooleanValue() input boolean = ", value, 2); + rv = cmdParamObj->SetBooleanValue(stateType, value); + RvTestResult(rv, "SetBooleanValue() test", 2); + } + else + QAOutput("SetBooleanValueTest(): We didn't get nsICommandParams object.", 1); +} + +void CnsICmdParams::SetLongValueTest(PRInt32 value, const char *stateType) +{ + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) { + FormatAndPrintOutput("The input state type = ", stateType, 2); + FormatAndPrintOutput("SetLongValue() input value = ", value, 2); + rv = cmdParamObj->SetLongValue(stateType, value); + RvTestResult(rv, "SetLongValue() test", 2); + } + else + QAOutput("SetLongValueTest(): We didn't get nsICommandParams object.", 1); +} + +void CnsICmdParams::SetDoubleValueTest(double value, const char *stateType) +{ + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) { + FormatAndPrintOutput("The input state type = ", stateType, 2); + FormatAndPrintOutput("SetDoubleValue() input value = ", value, 2); + rv = cmdParamObj->SetDoubleValue(stateType, value); + RvTestResult(rv, "SetDoubleValue() test", 2); + } + else + QAOutput("SetDoubleValueTest(): We didn't get nsICommandParams object.", 1); +} + +void CnsICmdParams::SetStringValueTest(char *value, const char *stateType) +{ + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) { + FormatAndPrintOutput("The input state type = ", stateType, 2); + FormatAndPrintOutput("SetStringValue() input value = ", value, 2); + rv = cmdParamObj->SetStringValue(stateType, NS_ConvertASCIItoUCS2(value)); + RvTestResult(rv, "SetStringValue() test", 2); + } + else + QAOutput("SetStringValueTest(): We didn't get nsICommandParams object.", 1); +} + +void CnsICmdParams::OnStartTests(UINT nMenuID) +{ + switch(nMenuID) + { + case ID_INTERFACES_NSICOMMANDPARAMS_RUNALLTESTS : + RunAllTests(); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_GETVALUETYPE : + GetValueTypeTest("state_attribute"); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_GETBOOLEANVALUE : + GetBooleanValueTest("state_mixed"); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_GETLONGVALUE : + GetLongValueTest("state_attribute"); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_GETDOUBLEVALUE : + GetDoubleValueTest("state_attribute"); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_GETSTRINGVALUE : + GetStringValueTest("state_attribute"); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_GETISUPPORTSVALUE : + QAOutput("Not implemented yet.", 2); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_SETBOOLEANVALUE : + SetBooleanValueTest(PR_TRUE, "state_attribute"); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_SETLONGVALUE : + SetLongValueTest(2.0, "state_attribute"); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_SETDOUBLEVALUE : + SetDoubleValueTest(3.0, "state_attribute"); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_SETSTRINGVALUE : + SetStringValueTest("HELLO!", "state_attribute"); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_SETISUPPORTSVALUE : + QAOutput("Not implemented yet.", 2); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_REMOVEVALUE : + QAOutput("Not implemented yet.", 2); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_HASMOREELEMENTS : + QAOutput("Not implemented yet.", 2); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_FIRST : + QAOutput("Not implemented yet.", 2); + break; + case ID_INTERFACES_NSICOMMANDPARAMS_GETNEXT : + QAOutput("Not implemented yet.", 2); + break; + } +} + +void CnsICmdParams::RunAllTests() +{ + cmdParamObj = GetCommandParamObject(); + if (cmdParamObj) + QAOutput("We got nsICommandParams object.", 2); + else + QAOutput("We didn't get nsICommandParams object.", 2); + + SetBooleanValueTest(PR_TRUE, "state_attribute"); + SetBooleanValueTest(PR_FALSE, "state_attribute"); + SetLongValueTest(100, "state_attribute"); + SetDoubleValueTest(100, "state_attribute"); + SetStringValueTest("Hello world!", "state_attribute"); + QAOutput("Other tests Not implemented yet.", 2); +} + + +///////////////////////////////////////////////////////////////////////////// +// nsICmdParams message handlers diff --git a/mozilla/embedding/qa/testembed/nsICmdParams.h b/mozilla/embedding/qa/testembed/nsICmdParams.h new file mode 100644 index 00000000000..27ae7bee8f0 --- /dev/null +++ b/mozilla/embedding/qa/testembed/nsICmdParams.h @@ -0,0 +1,72 @@ +#if !defined(AFX_NSICMDPARAMS_H__E2105F5B_B953_11D6_9BE4_00C04FA02BE6__INCLUDED_) +#define AFX_NSICMDPARAMS_H__E2105F5B_B953_11D6_9BE4_00C04FA02BE6__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 +// nsICmdParams.h : header file +// + +#include "QaUtils.h" +#include "BrowserFrm.h" +#include "BrowserImpl.h" +#include "BrowserView.h" +#include "Tests.h" +#include "nsICommandMgr.h" + +///////////////////////////////////////////////////////////////////////////// +// nsICmdParams window + +class CnsICommandMgr; + +class CnsICmdParams +{ +// Construction +public: + CnsICmdParams(nsIWebBrowser *mWebBrowser); + + nsCOMPtr qaWebBrowser; + nsCOMPtr cmdMgrObj; + nsCOMPtr cmdParamObj; +// Attributes +public: + +// Operations +public: + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CnsICmdParams) + //}}AFX_VIRTUAL + +// Implementation + nsICommandParams * GetCommandParamObject(); + nsICommandManager * GetCommandMgrObject(); + void GetValueTypeTest(const char *); + void GetBooleanValueTest(const char *); + void GetLongValueTest(const char *); + void GetDoubleValueTest(const char *); + void GetStringValueTest(const char *); + + void SetBooleanValueTest(PRBool, const char *); + void SetLongValueTest(PRInt32, const char *); + void SetDoubleValueTest(double, const char *); + void SetStringValueTest(char *, const char *); + + void OnStartTests(UINT nMenuID); + void RunAllTests(); + +public: + virtual ~CnsICmdParams(); + + // Generated message map functions +protected: + +}; + +///////////////////////////////////////////////////////////////////////////// + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_NSICMDPARAMS_H__E2105F5B_B953_11D6_9BE4_00C04FA02BE6__INCLUDED_) diff --git a/mozilla/embedding/qa/testembed/nsICommandMgr.cpp b/mozilla/embedding/qa/testembed/nsICommandMgr.cpp index 24fc7ea43d5..e2e5bdc859b 100644 --- a/mozilla/embedding/qa/testembed/nsICommandMgr.cpp +++ b/mozilla/embedding/qa/testembed/nsICommandMgr.cpp @@ -126,7 +126,7 @@ void CnsICommandMgr::IsCommandEnabledTest(const char *aCommandName) FormatAndPrintOutput("isEnabled boolean = ", isEnabled, 2); } -void CnsICommandMgr::GetCommandStateTest(const char *aCommandName, const char *aParameter) +void CnsICommandMgr::GetCommandStateTest(const char *aCommandName, const char *stateType) { PRBool enabled = PR_FALSE; @@ -134,7 +134,8 @@ void CnsICommandMgr::GetCommandStateTest(const char *aCommandName, const char *a cmdParamObj = GetCommandParamsObject(); rv = cmdMgrObj->GetCommandState(aCommandName, cmdParamObj); RvTestResult(rv, "GetCommandState() test", 2); - cmdParamObj->GetBooleanValue(aParameter, &enabled); + FormatAndPrintOutput("The input state type = ", stateType, 2); + cmdParamObj->GetBooleanValue(stateType, &enabled); FormatAndPrintOutput("isEnabled boolean = ", enabled, 2); } @@ -167,7 +168,7 @@ void CnsICommandMgr::OnStartTests(UINT nMenuID) IsCommandEnabledTest("cmd_bold"); break; case ID_INTERFACES_NSICOMMANDMANAGER_GETCOMMANDSTATE : - GetCommandStateTest("cmd_bold", "state_enabled"); + GetCommandStateTest("cmd_bold", "state_attribute"); break; case ID_INTERFACES_NSICOMMANDMANAGER_DOCOMMAND : nsCAutoString value; diff --git a/mozilla/embedding/qa/testembed/resource.h b/mozilla/embedding/qa/testembed/resource.h index c9cb74d9942..89695139529 100644 --- a/mozilla/embedding/qa/testembed/resource.h +++ b/mozilla/embedding/qa/testembed/resource.h @@ -247,6 +247,22 @@ #define ID_INTERFACES_NSICOMMANDMANAGER_ISCOMMANDENABLED 32977 #define ID_INTERFACES_NSICOMMANDMANAGER_GETCOMMANDSTATE 32978 #define ID_INTERFACES_NSICOMMANDMANAGER_DOCOMMAND 32979 +#define ID_INTERFACES_NSICOMMANDPARAMS_RUNALLTESTS 32980 +#define ID_INTERFACES_NSICOMMANDPARAMS_GETVALUETYPE 32981 +#define ID_INTERFACES_NSICOMMANDPARAMS_GETBOOLEANVALUE 32982 +#define ID_INTERFACES_NSICOMMANDPARAMS_GETLONGVALUE 32983 +#define ID_INTERFACES_NSICOMMANDPARAMS_GETDOUBLEVALUE 32984 +#define ID_INTERFACES_NSICOMMANDPARAMS_GETSTRINGVALUE 32985 +#define ID_INTERFACES_NSICOMMANDPARAMS_GETISUPPORTSVALUE 32986 +#define ID_INTERFACES_NSICOMMANDPARAMS_SETBOOLEANVALUE 32987 +#define ID_INTERFACES_NSICOMMANDPARAMS_SETLONGVALUE 32988 +#define ID_INTERFACES_NSICOMMANDPARAMS_SETDOUBLEVALUE 32989 +#define ID_INTERFACES_NSICOMMANDPARAMS_SETSTRINGVALUE 32990 +#define ID_INTERFACES_NSICOMMANDPARAMS_SETISUPPORTSVALUE 32991 +#define ID_INTERFACES_NSICOMMANDPARAMS_REMOVEVALUE 32992 +#define ID_INTERFACES_NSICOMMANDPARAMS_HASMOREELEMENTS 32993 +#define ID_INTERFACES_NSICOMMANDPARAMS_FIRST 32994 +#define ID_INTERFACES_NSICOMMANDPARAMS_GETNEXT 32995 #define ID_CLIPBOARDCMD_PASTE 42789 #define ID_CLIPBOARDCMD_COPYSELECTION 42790 #define ID_CLIPBOARDCMD_SELECTALL 42791 @@ -258,12 +274,12 @@ #define ID_CLIPBOARDCMD_CANPASTE 42797 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 153 -#define _APS_NEXT_COMMAND_VALUE 32980 +#define _APS_NEXT_COMMAND_VALUE 32996 #define _APS_NEXT_CONTROL_VALUE 1033 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/mozilla/embedding/qa/testembed/testembed.rc b/mozilla/embedding/qa/testembed/testembed.rc index 7cc6a988814..3c6df6cbed6 100644 --- a/mozilla/embedding/qa/testembed/testembed.rc +++ b/mozilla/embedding/qa/testembed/testembed.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE DISCARDABLE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE DISCARDABLE BEGIN "#define _AFX_NO_SPLITTER_RESOURCES\r\n" "#define _AFX_NO_OLE_RESOURCES\r\n" @@ -99,7 +99,7 @@ END // Menu // -IDR_MAINFRAME MENU PRELOAD DISCARDABLE +IDR_MAINFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&File" BEGIN @@ -539,6 +539,44 @@ BEGIN MENUITEM "DoCOmmand", ID_INTERFACES_NSICOMMANDMANAGER_DOCOMMAND END + POPUP "nsICommandParams" + BEGIN + MENUITEM "Run All Tests", ID_INTERFACES_NSICOMMANDPARAMS_RUNALLTESTS + + MENUITEM SEPARATOR + MENUITEM "GetValueType", ID_INTERFACES_NSICOMMANDPARAMS_GETVALUETYPE + + MENUITEM "GetBooleanValue", ID_INTERFACES_NSICOMMANDPARAMS_GETBOOLEANVALUE + + MENUITEM "GetLongValue", ID_INTERFACES_NSICOMMANDPARAMS_GETLONGVALUE + + MENUITEM "GetDoubleValue", ID_INTERFACES_NSICOMMANDPARAMS_GETDOUBLEVALUE + + MENUITEM "GetStringValue", ID_INTERFACES_NSICOMMANDPARAMS_GETSTRINGVALUE + + MENUITEM "GetISupportsValue", ID_INTERFACES_NSICOMMANDPARAMS_GETISUPPORTSVALUE + + MENUITEM SEPARATOR + MENUITEM "SetBooleanValue", ID_INTERFACES_NSICOMMANDPARAMS_SETBOOLEANVALUE + + MENUITEM "SetLongValue", ID_INTERFACES_NSICOMMANDPARAMS_SETLONGVALUE + + MENUITEM "SetDoubleValue", ID_INTERFACES_NSICOMMANDPARAMS_SETDOUBLEVALUE + + MENUITEM "SetStringValue", ID_INTERFACES_NSICOMMANDPARAMS_SETSTRINGVALUE + + MENUITEM "SetISupportsValue", ID_INTERFACES_NSICOMMANDPARAMS_SETISUPPORTSVALUE + + MENUITEM SEPARATOR + MENUITEM "RemoveValue", ID_INTERFACES_NSICOMMANDPARAMS_REMOVEVALUE + + MENUITEM "HasMoreElements", ID_INTERFACES_NSICOMMANDPARAMS_HASMOREELEMENTS + + MENUITEM "First", ID_INTERFACES_NSICOMMANDPARAMS_FIRST + + MENUITEM "GetNext", ID_INTERFACES_NSICOMMANDPARAMS_GETNEXT + + END END POPUP "T&ools" BEGIN @@ -554,7 +592,7 @@ BEGIN END END -IDR_CTXMENU_DOCUMENT MENU DISCARDABLE +IDR_CTXMENU_DOCUMENT MENU DISCARDABLE BEGIN POPUP "Document Context Menu" BEGIN @@ -574,7 +612,7 @@ BEGIN END END -IDR_CTXMENU_IMAGE MENU DISCARDABLE +IDR_CTXMENU_IMAGE MENU DISCARDABLE BEGIN POPUP "Image Context Menu" BEGIN @@ -591,7 +629,7 @@ BEGIN END END -IDR_CTXMENU_LINK MENU DISCARDABLE +IDR_CTXMENU_LINK MENU DISCARDABLE BEGIN POPUP "Link Context Menu" BEGIN @@ -610,7 +648,7 @@ BEGIN END END -IDR_CTXMENU_TEXT MENU DISCARDABLE +IDR_CTXMENU_TEXT MENU DISCARDABLE BEGIN POPUP "Selection Context Menu" BEGIN @@ -627,7 +665,7 @@ END // Accelerator // -IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE +IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE BEGIN "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT @@ -643,7 +681,7 @@ BEGIN VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT - VK_ESCAPE, ID_NAV_STOP, VIRTKEY + VK_ESCAPE, ID_NAV_STOP, VIRTKEY END @@ -678,7 +716,7 @@ BEGIN END IDD_PROMPT_PASSWORD_DIALOG DIALOG DISCARDABLE 0, 0, 248, 93 -STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | +STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Password Entry Dialog" FONT 8, "MS Sans Serif" @@ -713,7 +751,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Manage Profiles" FONT 8, "MS Sans Serif" BEGIN - LISTBOX IDC_LIST1,79,17,110,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | + LISTBOX IDC_LIST1,79,17,110,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Rename...",IDC_PROF_RENAME,7,7,50,14 PUSHBUTTON "Delete",IDC_PROF_DELETE,7,27,50,14 @@ -730,7 +768,7 @@ CAPTION "New Profile" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_NEW_PROF_NAME,39,16,122,14,ES_AUTOHSCROLL - COMBOBOX IDC_LOCALE_COMBO,39,35,67,30,CBS_DROPDOWNLIST | CBS_SORT | + COMBOBOX IDC_LOCALE_COMBO,39,35,67,30,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,120,58,50,14 PUSHBUTTON "Cancel",IDCANCEL,63,58,50,14 @@ -750,7 +788,7 @@ BEGIN END IDD_FINDDLG DIALOG DISCARDABLE 30, 73, 236, 62 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | +STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Find" FONT 8, "MS Shell Dlg" @@ -759,9 +797,9 @@ BEGIN EDITTEXT IDC_FIND_EDIT,47,7,128,12,ES_AUTOHSCROLL | WS_GROUP CONTROL "Match &whole word only",IDC_MATCH_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,90,12 - CONTROL "Wra&p around",IDC_WRAP_AROUND,"Button",BS_AUTOCHECKBOX | + CONTROL "Wra&p around",IDC_WRAP_AROUND,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,101,26,65,12 - CONTROL "Match &case",IDC_MATCH_CASE,"Button",BS_AUTOCHECKBOX | + CONTROL "Match &case",IDC_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,42,64,12 CONTROL "Search &backwards",IDC_SEARCH_BACKWARDS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,101,42,67,12 @@ -770,7 +808,7 @@ BEGIN END IDD_PRINT_PROGRESS_DIALOG DIALOG DISCARDABLE 0, 0, 294, 55 -STYLE DS_SYSMODAL | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | +STYLE DS_SYSMODAL | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Printing..." FONT 8, "MS Sans Serif" @@ -806,7 +844,7 @@ BEGIN 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 - COMBOBOX IDC_COMBO1,25,29,86,72,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO1,25,29,86,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Select Load Flag:",IDC_CHKURLFLAG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,32,14,80,10 @@ -818,7 +856,7 @@ CAPTION "Test Results" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "Close",IDOK,274,165,50,14 - CONTROL "List1",IDC_LIST1,"SysListView32",LVS_REPORT | + CONTROL "List1",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,317,154 END @@ -841,7 +879,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,129,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 LTEXT "Web Prog Notification Flag",IDC_STATIC,29,46,97,8 - COMBOBOX IDC_WPCOMBO,22,65,105,70,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_WPCOMBO,22,65,105,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -895,7 +933,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -979,52 +1017,52 @@ END IDD_URLDIALOG DLGINIT BEGIN IDC_COMBO1, 0x403, 6, 0 -0x4f4e, 0x454e, 0x0020, +0x4f4e, 0x454e, 0x0020, IDC_COMBO1, 0x403, 5, 0 -0x414d, 0x4b53, "\000" +0x414d, 0x4b53, "\000" IDC_COMBO1, 0x403, 8, 0 -0x5349, 0x4c5f, 0x4e49, 0x004b, +0x5349, 0x4c5f, 0x4e49, 0x004b, IDC_COMBO1, 0x403, 15, 0 -0x5942, 0x4150, 0x5353, 0x485f, 0x5349, 0x4f54, 0x5952, "\000" +0x5942, 0x4150, 0x5353, 0x485f, 0x5349, 0x4f54, 0x5952, "\000" IDC_COMBO1, 0x403, 16, 0 -0x4552, 0x4c50, 0x4341, 0x5f45, 0x4948, 0x5453, 0x524f, 0x0059, +0x4552, 0x4c50, 0x4341, 0x5f45, 0x4948, 0x5453, 0x524f, 0x0059, IDC_COMBO1, 0x403, 13, 0 -0x5942, 0x4150, 0x5353, 0x435f, 0x4341, 0x4548, "\000" +0x5942, 0x4150, 0x5353, 0x435f, 0x4341, 0x4548, "\000" IDC_COMBO1, 0x403, 13, 0 -0x5942, 0x4150, 0x5353, 0x505f, 0x4f52, 0x5958, "\000" +0x5942, 0x4150, 0x5353, 0x505f, 0x4f52, 0x5958, "\000" IDC_COMBO1, 0x403, 15, 0 -0x4843, 0x5241, 0x4553, 0x5f54, 0x4843, 0x4e41, 0x4547, "\000" +0x4843, 0x5241, 0x4553, 0x5f54, 0x4843, 0x4e41, 0x4547, "\000" IDC_COMBO1, 0x403, 8, 0 -0x4552, 0x5246, 0x5345, 0x0048, +0x4552, 0x5246, 0x5345, 0x0048, 0 END IDD_WEBPROGDLG DLGINIT BEGIN IDC_WPCOMBO, 0x403, 21, 0 -0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x525f, 0x5145, 0x4555, -0x5453, "\000" +0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x525f, 0x5145, 0x4555, +0x5453, "\000" IDC_WPCOMBO, 0x403, 22, 0 -0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x445f, 0x434f, 0x4d55, -0x4e45, 0x0054, +0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x445f, 0x434f, 0x4d55, +0x4e45, 0x0054, IDC_WPCOMBO, 0x403, 21, 0 -0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x4e5f, 0x5445, 0x4f57, -0x4b52, "\000" +0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x4e5f, 0x5445, 0x4f57, +0x4b52, "\000" IDC_WPCOMBO, 0x403, 20, 0 -0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x575f, 0x4e49, 0x4f44, -0x0057, +0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x575f, 0x4e49, 0x4f44, +0x0057, IDC_WPCOMBO, 0x403, 17, 0 -0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x415f, 0x4c4c, "\000" +0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x4554, 0x415f, 0x4c4c, "\000" IDC_WPCOMBO, 0x403, 16, 0 -0x4f4e, 0x4954, 0x5946, 0x505f, 0x4f52, 0x5247, 0x5345, 0x0053, +0x4f4e, 0x4954, 0x5946, 0x505f, 0x4f52, 0x5247, 0x5345, 0x0053, IDC_WPCOMBO, 0x403, 14, 0 -0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x5554, 0x0053, +0x4f4e, 0x4954, 0x5946, 0x535f, 0x4154, 0x5554, 0x0053, IDC_WPCOMBO, 0x403, 16, 0 -0x4f4e, 0x4954, 0x5946, 0x535f, 0x4345, 0x5255, 0x5449, 0x0059, +0x4f4e, 0x4954, 0x5946, 0x535f, 0x4345, 0x5255, 0x5449, 0x0059, IDC_WPCOMBO, 0x403, 16, 0 -0x4f4e, 0x4954, 0x5946, 0x4c5f, 0x434f, 0x5441, 0x4f49, 0x004e, +0x4f4e, 0x4954, 0x5946, 0x4c5f, 0x434f, 0x5441, 0x4f49, 0x004e, IDC_WPCOMBO, 0x403, 11, 0 -0x4f4e, 0x4954, 0x5946, 0x415f, 0x4c4c, "\000" +0x4f4e, 0x4954, 0x5946, 0x415f, 0x4c4c, "\000" 0 END @@ -1034,35 +1072,35 @@ END // String Table // -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDR_MAINFRAME "testembed" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN AFX_IDS_APP_TITLE "testembed" AFX_IDS_IDLEMESSAGE "Ready" END -STRINGTABLE DISCARDABLE +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 +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 +STRINGTABLE DISCARDABLE BEGIN ID_WINDOW_SPLIT "Split the active window into panes\nSplit" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EDIT_CLEAR "Erase the selection\nErase" ID_EDIT_CLEAR_ALL "Erase everything\nErase All" @@ -1077,13 +1115,13 @@ BEGIN ID_EDIT_REDO "Redo the previously undone action\nRedo" END -STRINGTABLE DISCARDABLE +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 +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCSIZE "Change the window size" AFX_IDS_SCMOVE "Change the window position" @@ -1094,19 +1132,19 @@ BEGIN AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCRESTORE "Restore the window to normal size" AFX_IDS_SCTASKLIST "Activate Task List" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_NAV_RELOAD "Tool Tip\nTool Tip" ID_EDIT_SELECT_NONE "Select nothing in the document\nSelect None" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_INTERFACES_TEMP "Temporary" END