diff --git a/mozilla/embedding/qa/testembed/components/Dialogs.cpp b/mozilla/embedding/qa/testembed/components/Dialogs.cpp
index b8b37022e35..8b9a722f10c 100644
--- a/mozilla/embedding/qa/testembed/components/Dialogs.cpp
+++ b/mozilla/embedding/qa/testembed/components/Dialogs.cpp
@@ -40,14 +40,14 @@ CPromptDialog::CPromptDialog(CWnd* pParent, const char* pTitle, const char* pTex
     : CDialog(CPromptDialog::IDD, pParent),
     m_bHasCheckBox(bHasCheck)
 {   
-	if(pTitle)
-		m_csDialogTitle = pTitle;
-	if(pText)
-		m_csPromptText = pText;
-	if(pInitPromptText)
-		m_csPromptAnswer = pInitPromptText;
-	if(pCheckText)
-	    m_csCheckBoxText = pCheckText; 
+    if(pTitle)
+        m_csDialogTitle = pTitle;
+    if(pText)
+        m_csPromptText = pText;
+    if(pInitPromptText)
+        m_csPromptAnswer = pInitPromptText;
+    if(pCheckText)
+        m_csCheckBoxText = pCheckText; 
 }
 
 void CPromptDialog::DoDataExchange(CDataExchange* pDX)
@@ -61,46 +61,46 @@ void CPromptDialog::DoDataExchange(CDataExchange* pDX)
 
 BEGIN_MESSAGE_MAP(CPromptDialog, CDialog)
     //{{AFX_MSG_MAP(CPromptDialog)
-		// NOTE: the ClassWizard will add message map macros here
+        // NOTE: the ClassWizard will add message map macros here
     //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 int CPromptDialog::OnInitDialog()
 {   
-   	SetWindowText(m_csDialogTitle);
+    SetWindowText(m_csDialogTitle);
   
-	CWnd *pWnd = GetDlgItem(IDC_PROMPT_TEXT);
-	if(pWnd)
-		pWnd->SetWindowText(m_csPromptText);
+    CWnd *pWnd = GetDlgItem(IDC_PROMPT_TEXT);
+    if(pWnd)
+        pWnd->SetWindowText(m_csPromptText);
 
-  CButton *pChk = (CButton *)GetDlgItem(IDC_CHECK_SAVE_PASSWORD);
-	if(pChk)
-	{
-	    if (m_bHasCheckBox)
-	    {
-		    if(!m_csCheckBoxText.IsEmpty())
-			    pChk->SetWindowText(m_csCheckBoxText);
-			pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
-		}
-		else
-		{
-			// Hide the check box control if there's no label text
-			// This will be the case when we're not using single sign-on
-			pChk->ShowWindow(SW_HIDE); 
-		}
-	}
+    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECK_SAVE_PASSWORD);
+    if(pChk)
+    {
+        if (m_bHasCheckBox)
+        {
+            if(!m_csCheckBoxText.IsEmpty())
+                pChk->SetWindowText(m_csCheckBoxText);
+            pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
+        }
+        else
+        {
+            // Hide the check box control if there's no label text
+            // This will be the case when we're not using single sign-on
+            pChk->ShowWindow(SW_HIDE); 
+        }
+    }
 
-	CEdit *pEdit = (CEdit *)GetDlgItem(IDC_PROMPT_ANSWER);
-	if(pEdit) 
-	{
-		pEdit->SetWindowText(m_csPromptAnswer);
-		pEdit->SetFocus();
-		pEdit->SetSel(0, -1);
+    CEdit *pEdit = (CEdit *)GetDlgItem(IDC_PROMPT_ANSWER);
+    if(pEdit) 
+    {
+        pEdit->SetWindowText(m_csPromptAnswer);
+        pEdit->SetFocus();
+        pEdit->SetSel(0, -1);
 
-		return 0; // Returning "0" since we're explicitly setting focus
-	}
+        return 0; // Returning "0" since we're explicitly setting focus
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 //--------------------------------------------------------------------------//
@@ -128,50 +128,50 @@ void CPromptPasswordDialog::DoDataExchange(CDataExchange* pDX)
     CDialog::DoDataExchange(pDX);
     //{{AFX_DATA_MAP(CPromptPasswordDialog)
     DDX_Text(pDX, IDC_PASSWORD, m_csPassword);
-	  DDX_Check(pDX, IDC_CHECK_SAVE_PASSWORD, m_bCheckBoxValue);
+    DDX_Check(pDX, IDC_CHECK_SAVE_PASSWORD, m_bCheckBoxValue);
     //}}AFX_DATA_MAP
 }
 
 BEGIN_MESSAGE_MAP(CPromptPasswordDialog, CDialog)
     //{{AFX_MSG_MAP(CPromptPasswordDialog)
-		// NOTE: the ClassWizard will add message map macros here
+        // NOTE: the ClassWizard will add message map macros here
     //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 int CPromptPasswordDialog::OnInitDialog()
 {   
-  SetWindowText(m_csDialogTitle);
+    SetWindowText(m_csDialogTitle);
   
-	CWnd *pWnd = GetDlgItem(IDC_PROMPT_TEXT);
-	if(pWnd)
-		pWnd->SetWindowText(m_csPromptText);
+    CWnd *pWnd = GetDlgItem(IDC_PROMPT_TEXT);
+    if(pWnd)
+        pWnd->SetWindowText(m_csPromptText);
 
-	CButton *pChk = (CButton *)GetDlgItem(IDC_CHECK_SAVE_PASSWORD);
-	if(pChk)
-	{
-	  if (m_bHasCheckBox)
-	  {
-		  if(!m_csCheckBoxText.IsEmpty())
-			  pChk->SetWindowText(m_csCheckBoxText);
-			pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
-		}
-		else
-		{
-			// Hide the check box control if there's no label text
-			// This will be the case when we're not using single sign-on
-			pChk->ShowWindow(SW_HIDE); 
-		}
-	}
+    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECK_SAVE_PASSWORD);
+    if(pChk)
+    {
+        if (m_bHasCheckBox)
+        {
+            if(!m_csCheckBoxText.IsEmpty())
+                pChk->SetWindowText(m_csCheckBoxText);
+            pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
+        }
+        else
+        {
+            // Hide the check box control if there's no label text
+            // This will be the case when we're not using single sign-on
+            pChk->ShowWindow(SW_HIDE); 
+        }
+    }
 
-	CEdit *pEdit = (CEdit *)GetDlgItem(IDC_PASSWORD);
-	if(pEdit) 
-	{
-		pEdit->SetFocus();
+    CEdit *pEdit = (CEdit *)GetDlgItem(IDC_PASSWORD);
+    if(pEdit) 
+    {
+        pEdit->SetFocus();
 
-		return 0; // Returning "0" since we're explicitly setting focus
-	}
+        return 0; // Returning "0" since we're explicitly setting focus
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 //--------------------------------------------------------------------------//
@@ -184,31 +184,31 @@ CPromptUsernamePasswordDialog::CPromptUsernamePasswordDialog(CWnd* pParent, cons
     : CDialog(CPromptUsernamePasswordDialog::IDD, pParent),
     m_bHasCheckBox(bHasCheck), m_bCheckBoxValue(initCheckVal)
 {
-	if(pTitle)
-		m_csDialogTitle = pTitle;
-	if(pText)
-		m_csPromptText = pText;
-	if(pInitUsername)
-		m_csUserName = pInitUsername;
-	if(pInitPassword)
-		m_csPassword = pInitPassword;
-	if(pCheckText)
-		m_csCheckBoxText = pCheckText;
+    if(pTitle)
+        m_csDialogTitle = pTitle;
+    if(pText)
+        m_csPromptText = pText;
+    if(pInitUsername)
+        m_csUserName = pInitUsername;
+    if(pInitPassword)
+        m_csPassword = pInitPassword;
+    if(pCheckText)
+        m_csCheckBoxText = pCheckText;
 }
 
 void CPromptUsernamePasswordDialog::DoDataExchange(CDataExchange* pDX)
 {
     CDialog::DoDataExchange(pDX);
     //{{AFX_DATA_MAP(CPromptUsernamePasswordDialog)
-	DDX_Text(pDX, IDC_USERNAME, m_csUserName);
+    DDX_Text(pDX, IDC_USERNAME, m_csUserName);
     DDX_Text(pDX, IDC_PASSWORD, m_csPassword);
-	DDX_Check(pDX, IDC_CHECK_SAVE_PASSWORD, m_bCheckBoxValue);
+    DDX_Check(pDX, IDC_CHECK_SAVE_PASSWORD, m_bCheckBoxValue);
     //}}AFX_DATA_MAP
 }
 
 BEGIN_MESSAGE_MAP(CPromptUsernamePasswordDialog, CDialog)
     //{{AFX_MSG_MAP(CPromptUsernamePasswordDialog)
-		// NOTE: the ClassWizard will add message map macros here
+        // NOTE: the ClassWizard will add message map macros here
     //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -216,41 +216,207 @@ int CPromptUsernamePasswordDialog::OnInitDialog()
 {   
    	SetWindowText(m_csDialogTitle);
   
-	CWnd *pWnd = GetDlgItem(IDC_PROMPT_TEXT);
-	if(pWnd)
-		pWnd->SetWindowText(m_csPromptText);
+    CWnd *pWnd = GetDlgItem(IDC_PROMPT_TEXT);
+    if(pWnd)
+        pWnd->SetWindowText(m_csPromptText);
 
-	CButton *pChk = (CButton *)GetDlgItem(IDC_CHECK_SAVE_PASSWORD);
-	if(pChk)
-	{
-		if(m_bHasCheckBox)
-		{
-		    if (!m_csCheckBoxText.IsEmpty())
-			    pChk->SetWindowText(m_csCheckBoxText);
-			pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
-		}
-		else
-		{
-			pChk->ShowWindow(SW_HIDE);
-		}
-	}
+    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECK_SAVE_PASSWORD);
+    if(pChk)
+    {
+        if(m_bHasCheckBox)
+        {
+            if (!m_csCheckBoxText.IsEmpty())
+                pChk->SetWindowText(m_csCheckBoxText);
+            pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
+        }
+        else
+        {
+            pChk->ShowWindow(SW_HIDE);
+        }
+    }
 
-	CEdit *pEdit = (CEdit *)GetDlgItem(IDC_PASSWORD);
-	if(pEdit) 
-	{
-		pEdit->SetWindowText(m_csPassword);
-	}
+    CEdit *pEdit = (CEdit *)GetDlgItem(IDC_PASSWORD);
+    if(pEdit) 
+    {
+        pEdit->SetWindowText(m_csPassword);
+    }
 
-	pEdit = (CEdit *)GetDlgItem(IDC_USERNAME);
-	if(pEdit) 
-	{
-		pEdit->SetWindowText(m_csUserName);
-		pEdit->SetSel(0, -1);
+    pEdit = (CEdit *)GetDlgItem(IDC_USERNAME);
+    if(pEdit) 
+    {
+        pEdit->SetWindowText(m_csUserName);
+        pEdit->SetSel(0, -1);
 
-		pEdit->SetFocus();
+        pEdit->SetFocus();
 
-		return 0; // Returning "0" since we're explicitly setting focus
-	}
+        return 0; // Returning "0" since we're explicitly setting focus
+    }
 
-	return TRUE;
+    return TRUE;
+}
+
+//--------------------------------------------------------------------------//
+//				CAlertCheckDialog Stuff
+//--------------------------------------------------------------------------//
+
+CAlertCheckDialog::CAlertCheckDialog(CWnd* pParent, const char* pTitle, const char* pText,
+                             const char* pCheckText, int initCheckVal)
+        : CDialog(CAlertCheckDialog::IDD, pParent)
+{   
+    if(pTitle)
+        m_csDialogTitle = pTitle;
+    if(pText)
+        m_csMsgText = pText;
+    if(pCheckText)
+        m_csCheckBoxText = pCheckText; 
+
+    m_bCheckBoxValue = initCheckVal;
+}
+
+void CAlertCheckDialog::DoDataExchange(CDataExchange* pDX)
+{
+    CDialog::DoDataExchange(pDX);
+    //{{AFX_DATA_MAP(CAlertCheckDialog)
+    DDX_Check(pDX, IDC_CHECKBOX, m_bCheckBoxValue);
+    //}}AFX_DATA_MAP
+}
+
+BEGIN_MESSAGE_MAP(CAlertCheckDialog, CDialog)
+    //{{AFX_MSG_MAP(CAlertCheckDialog)
+        // NOTE: the ClassWizard will add message map macros here
+    //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+int CAlertCheckDialog::OnInitDialog()
+{
+    SetWindowText(m_csDialogTitle);
+
+    CWnd *pWnd = GetDlgItem(IDC_MSG_TEXT);
+    if(pWnd)
+        pWnd->SetWindowText(m_csMsgText);
+
+    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECKBOX);
+    if(pChk)
+    {
+        pChk->SetWindowText(m_csCheckBoxText);
+        pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
+    }
+
+    return TRUE;
+}
+
+//--------------------------------------------------------------------------//
+//				CConfirmCheckDialog Stuff
+//--------------------------------------------------------------------------//
+
+CConfirmCheckDialog::CConfirmCheckDialog(CWnd* pParent, const char* pTitle, const char* pText,
+                            const char* pCheckText, int initCheckVal,
+                            const char *pBtn1Text, const char *pBtn2Text, 
+                            const char *pBtn3Text)
+            : CDialog(CConfirmCheckDialog::IDD, pParent)
+{   
+    if(pTitle)
+        m_csDialogTitle = pTitle;
+    if(pText)
+        m_csMsgText = pText;
+    if(pCheckText)
+        m_csCheckBoxText = pCheckText; 
+
+    m_bCheckBoxValue = initCheckVal;
+
+    if(pBtn1Text)
+        m_csBtn1Text = pBtn1Text;
+    if(pBtn2Text)
+        m_csBtn2Text = pBtn2Text;
+    if(pBtn3Text)
+        m_csBtn3Text = pBtn3Text;
+}
+
+void CConfirmCheckDialog::DoDataExchange(CDataExchange* pDX)
+{
+    CDialog::DoDataExchange(pDX);
+    //{{AFX_DATA_MAP(CConfirmCheckDialog)
+    DDX_Check(pDX, IDC_CHECKBOX, m_bCheckBoxValue);
+    //}}AFX_DATA_MAP
+}
+
+BEGIN_MESSAGE_MAP(CConfirmCheckDialog, CDialog)
+    //{{AFX_MSG_MAP(CConfirmCheckDialog)
+    ON_BN_CLICKED(IDC_BTN1, OnBtn1Clicked)
+    ON_BN_CLICKED(IDC_BTN2, OnBtn2Clicked)
+    ON_BN_CLICKED(IDC_BTN3, OnBtn3Clicked)
+    //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+int CConfirmCheckDialog::OnInitDialog()
+{   
+   	SetWindowText(m_csDialogTitle);
+  
+    CWnd *pWnd = GetDlgItem(IDC_MSG_TEXT);
+    if(pWnd)
+        pWnd->SetWindowText(m_csMsgText);
+
+    CButton *pChk = (CButton *)GetDlgItem(IDC_CHECKBOX);
+    if(pChk)
+    {
+        if(m_csCheckBoxText.IsEmpty())
+        {
+            pChk->ShowWindow(SW_HIDE);
+        }
+        else
+        {
+            pChk->SetWindowText(m_csCheckBoxText);
+            pChk->SetCheck(m_bCheckBoxValue ? BST_CHECKED : BST_UNCHECKED);
+        }
+    }
+
+    CButton *pBtn1 = (CButton *)GetDlgItem(IDC_BTN1);
+    if(pBtn1)
+    {
+        if(m_csBtn1Text.IsEmpty())
+            pBtn1->ShowWindow(SW_HIDE);
+        else
+            pBtn1->SetWindowText(m_csBtn1Text);
+    }
+
+    CButton *pBtn2 = (CButton *)GetDlgItem(IDC_BTN2);
+    if(pBtn2)
+    {
+        if(m_csBtn2Text.IsEmpty())
+            pBtn2->ShowWindow(SW_HIDE);
+        else
+            pBtn2->SetWindowText(m_csBtn2Text);
+    }
+
+    CButton *pBtn3 = (CButton *)GetDlgItem(IDC_BTN3);
+    if(pBtn3)
+    {
+        if(m_csBtn3Text.IsEmpty())
+            pBtn3->ShowWindow(SW_HIDE);
+        else
+            pBtn3->SetWindowText(m_csBtn3Text);
+    }
+
+    return TRUE;
+}
+
+void CConfirmCheckDialog::OnBtn1Clicked()
+{
+    UpdateData();
+
+    EndDialog(0); // where 0 indicates that the btn pressed was at index 0
+}
+
+void CConfirmCheckDialog::OnBtn2Clicked()
+{
+    UpdateData();
+
+    EndDialog(1); // where 1 indicates that the btn pressed was at index 1
+}
+
+void CConfirmCheckDialog::OnBtn3Clicked()
+{
+    UpdateData();
+
+    EndDialog(2); // where 2 indicates that the btn pressed was at index 2
 }
diff --git a/mozilla/embedding/qa/testembed/components/Dialogs.h b/mozilla/embedding/qa/testembed/components/Dialogs.h
index f76a05da45a..797af69053c 100644
--- a/mozilla/embedding/qa/testembed/components/Dialogs.h
+++ b/mozilla/embedding/qa/testembed/components/Dialogs.h
@@ -34,10 +34,8 @@ public:
                   BOOL bHasCheck, const char* pCheckText, int initCheckVal);
 	
 	// Dialog Data
-    //{{AFX_DATA(CPromptDialog)
     enum { IDD = IDD_PROMPT_DIALOG };
     CString m_csPromptAnswer;
-    //}}AFX_DATA
 
     CString m_csDialogTitle;
 	CString m_csPromptText;
@@ -65,9 +63,7 @@ public:
                           BOOL bHasCheck, const char* pCheckText, int initCheckVal);
 	
 	// Dialog Data
-    //{{AFX_DATA(CPromptPasswordDialog)
     enum { IDD = IDD_PROMPT_PASSWORD_DIALOG };
-    //}}AFX_DATA
 
     CString m_csDialogTitle;
 	CString m_csPromptText;
@@ -96,9 +92,7 @@ public:
 		                          BOOL bHasCheck, const char* pCheckText, int initCheckVal);
 	
 	// Dialog Data
-    //{{AFX_DATA(CPromptUsernamePasswordDialog)
     enum { IDD = IDD_PROMPT_USERPASS_DIALOG };
-    //}}AFX_DATA
 
     CString m_csDialogTitle;
 	CString m_csPromptText;
@@ -123,4 +117,66 @@ public:
     DECLARE_MESSAGE_MAP()
 };
 
+class CAlertCheckDialog : public CDialog
+{
+public:
+    CAlertCheckDialog(CWnd* pParent, const char* pTitle, const char* pText,
+                  const char* pCheckText, int initCheckVal);
+	
+    // Dialog Data
+    enum { IDD = IDD_ALERT_CHECK_DIALOG };
+
+    CString m_csDialogTitle;
+    CString m_csMsgText;
+    CString m_csCheckBoxText;
+    int m_bCheckBoxValue;
+    
+    // ClassWizard generated virtual function overrides
+    //{{AFX_VIRTUAL(CAlertCheckDialog)
+    protected:
+    virtual void DoDataExchange(CDataExchange* pDX);
+    //}}AFX_VIRTUAL
+
+    //{{AFX_MSG(CAlertCheckDialog)
+    virtual BOOL OnInitDialog();
+    //}}AFX_MSG
+
+    DECLARE_MESSAGE_MAP()
+};
+
+class CConfirmCheckDialog : public CDialog
+{
+public:
+    CConfirmCheckDialog(CWnd* pParent, const char* pTitle, const char* pText,
+                  const char* pCheckText, int initCheckVal,
+                  const char *pBtn1Text, const char *pBtn2Text, 
+                  const char *pBtn3Text);
+	
+    // Dialog Data
+    enum { IDD = IDD_CONFIRM_CHECK_DIALOG };
+
+    CString m_csDialogTitle;
+    CString m_csMsgText;
+    CString m_csCheckBoxText;
+    int m_bCheckBoxValue;
+    CString m_csBtn1Text;
+    CString m_csBtn2Text;
+    CString m_csBtn3Text;
+
+    // ClassWizard generated virtual function overrides
+    //{{AFX_VIRTUAL(CConfirmCheckDialog)
+    protected:
+    virtual void DoDataExchange(CDataExchange* pDX);
+    //}}AFX_VIRTUAL
+
+    //{{AFX_MSG(CConfirmCheckDialog)
+    virtual BOOL OnInitDialog();
+    afx_msg void OnBtn1Clicked();
+    afx_msg void OnBtn2Clicked();
+    afx_msg void OnBtn3Clicked();
+    //}}AFX_MSG
+
+    DECLARE_MESSAGE_MAP()
+};
+
 #endif //_DIALOG_H_
diff --git a/mozilla/embedding/qa/testembed/components/Dialogs.rc b/mozilla/embedding/qa/testembed/components/Dialogs.rc
index 0162cbf641c..863f6a5cc67 100644
--- a/mozilla/embedding/qa/testembed/components/Dialogs.rc
+++ b/mozilla/embedding/qa/testembed/components/Dialogs.rc
@@ -50,7 +50,7 @@ BEGIN
     "LANGUAGE 9, 1\r\n"
     "#pragma code_page(1252)\r\n"
     "#endif //_WIN32\r\n"
-    "#include ""res\\testembed.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#include ""res\\mfcembed.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
     "\0"
@@ -108,6 +108,69 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,95,101,50,14
 END
 
+IDD_ALERT_CHECK_DIALOG DIALOG DISCARDABLE  0, 0, 233, 151
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Alert"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,91,127,50,14
+    CONTROL         "",IDC_CHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,
+                    104,215,10
+    EDITTEXT        IDC_MSG_TEXT,10,10,214,88,ES_MULTILINE | ES_READONLY
+END
+
+IDD_CONFIRM_CHECK_DIALOG DIALOG DISCARDABLE  0, 0, 371, 111
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ConfirmCheck"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "Btn1",IDC_BTN1,104,90,50,14
+    CONTROL         "",IDC_CHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
+                    62,355,10
+    LTEXT           "",IDC_MSG_TEXT,6,10,354,39
+    DEFPUSHBUTTON   "Btn2",IDC_BTN2,164,89,50,14
+    DEFPUSHBUTTON   "Btn3",IDC_BTN3,224,89,50,14
+END
+
+IDD_PROGRESS_DIALOG DIALOG DISCARDABLE  0, 0, 285, 95
+STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "Saving File"
+FONT 8, "MS Sans Serif"
+BEGIN
+    PUSHBUTTON      "Cancel",IDCANCEL,115,73,50,14
+    LTEXT           "Action:",IDC_STATIC,27,23,26,9
+    CONTROL         "",IDC_ACTION,"Static",SS_LEFTNOWORDWRAP | 
+                    WS_GROUP,59,23,211,8
+    LTEXT           "Saving From:",IDC_STATIC,7,6,42,8
+    LTEXT           "",IDC_SAVING_FROM,59,6,213,8
+    LTEXT           "Progress:",IDC_STATIC,19,41,30,8
+    CONTROL         "Progress1",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | 
+                    WS_BORDER,59,41,166,10
+    LTEXT           "100%",IDC_STATIC,229,42,18,8
+END
+
+IDD_CHOOSE_ACTION_DIALOG DIALOG DISCARDABLE  0, 0, 285, 114
+STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "Choose An Action"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "You have chosen to download a file of type: ",
+                    IDC_STATIC,8,9,142,8
+    LTEXT           "Static",IDC_CONTENT_TYPE,152,10,123,8
+    GROUPBOX        "What would you like MfcEmbed to do with this file?",
+                    IDC_STATIC,8,24,268,61
+    CONTROL         "O&pen using",IDC_OPEN_USING,"Button",BS_AUTORADIOBUTTON | 
+                    WS_TABSTOP,19,41,60,10
+    CONTROL         "&Save this file to disk",IDC_SAVE_TO_DISK,"Button",
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,19,69,103,10
+    LTEXT           "Static",IDC_APP_NAME,31,53,186,9,SS_SUNKEN
+    PUSHBUTTON      "&Choose...",IDC_CHOOSE_APP,222,51,50,12
+    PUSHBUTTON      "Ok",IDOK,94,94,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,150,94,50,14
+END
+
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/mozilla/embedding/qa/testembed/components/makefile.win b/mozilla/embedding/qa/testembed/components/makefile.win
index 37f70b31cbd..5fa18c0decd 100644
--- a/mozilla/embedding/qa/testembed/components/makefile.win
+++ b/mozilla/embedding/qa/testembed/components/makefile.win
@@ -51,3 +51,4 @@ install:: $(DLL)
 clobber::
     $(RM) $(DIST)\bin\$(DLL_NAME).dll
     $(RM) $(DIST)\lib\$(DLL_NAME).lib
+    $(RM) $(DIST)\lib\$(DLL_NAME).res
\ No newline at end of file
diff --git a/mozilla/embedding/qa/testembed/components/resource.h b/mozilla/embedding/qa/testembed/components/resource.h
index d81b9958ac6..df2de370eb3 100644
--- a/mozilla/embedding/qa/testembed/components/resource.h
+++ b/mozilla/embedding/qa/testembed/components/resource.h
@@ -5,6 +5,10 @@
 #define IDD_PROMPT_DIALOG               128
 #define IDD_PROMPT_PASSWORD_DIALOG      129
 #define IDD_PROMPT_USERPASS_DIALOG      130
+#define IDD_ALERT_CHECK_DIALOG          131
+#define IDD_CONFIRM_CHECK_DIALOG        132
+#define IDD_PROGRESS_DIALOG             133
+#define IDD_CHOOSE_ACTION_DIALOG        134
 #define IDC_PROMPT_ANSWER               1001
 #define IDC_PROMPT_TEXT                 1002
 #define IDC_USERNAME                    1003
@@ -12,6 +16,19 @@
 #define IDC_CHECK_SAVE_PASSWORD         1005
 #define IDC_USERNAME_LABEL              1006
 #define IDC_PASSWORD_LABEL              1007
+#define IDC_CHECKBOX                    1008
+#define IDC_MSG_TEXT                    1009
+#define IDC_BTN1                        1010
+#define IDC_BTN2                        1011
+#define IDC_BTN3                        1012
+#define IDC_ACTION                      1013
+#define IDC_SAVING_FROM                 1014
+#define IDC_PROGRESS                    1015
+#define IDC_CONTENT_TYPE                1016
+#define IDC_SAVE_TO_DISK                1017
+#define IDC_OPEN_USING                  1018
+#define IDC_CHOOSE_APP                  1019
+#define IDC_APP_NAME                    1020
 
 // Next default values for new objects
 //