Merging 4.5 SmartUpdate changes

cmd/winfe/prefs.cpp

@@ -1862,7 +1862,6 @@ class CSmartUpdatePrefs : public ISmartUpdatePrefs {
 		STDMETHODIMP_(ULONG) Release();
 		
         // ISmartUpdatePrefs methods
-	    STDMETHODIMP_(LONG) RegPack();
         STDMETHODIMP_(LONG) Uninstall(char* regPackageName);
         STDMETHODIMP_(LONG) EnumUninstall(void** context, char* packageName,
                                     LONG len1, char*regPackageName, LONG len2);
@@ -1911,12 +1910,6 @@ CSmartUpdatePrefs::Release()
 	return m_uRef;
 }
 
-STDMETHODIMP_(LONG)
-CSmartUpdatePrefs::RegPack()
-{
-	return VR_PackRegistry();
-}
-
 STDMETHODIMP_(LONG)
 CSmartUpdatePrefs::Uninstall(char* regPackageName)
 {

cmd/winfe/prefs/brpref/public/ibrprefs.h

@@ -146,7 +146,6 @@ DECLARE_INTERFACE_(ISmartUpdatePrefs, IUnknown)
 	STDMETHOD_(ULONG,Release)(THIS) PURE;
 
 	// IBrowserPrefs methods
-	STDMETHOD_(LONG,RegPack)(THIS) PURE;
     STDMETHOD_(LONG,Uninstall)(THIS_ char* regPackageName) PURE;
     STDMETHOD_(LONG,EnumUninstall)(THIS_ void** context, char* packageName,
                                     LONG len1, char*regPackageName, LONG len2) PURE;

cmd/winfe/prefs/brpref/src/advpages.cpp

@@ -663,25 +663,6 @@ BOOL
 CSmartUpdatePrefs::OnCommand(int id, HWND hwndCtl, UINT notifyCode)
 {
 	if (id == IDC_BUTTON1 && notifyCode == BN_CLICKED) {
-       	assert(m_pObject);
-		if (m_pObject) {
-            LPADVANCEDPREFS lpAdvancedPrefs;
-
-            if (SUCCEEDED(m_pObject->QueryInterface(IID_IAdvancedPrefs, (void **)&lpAdvancedPrefs))) {
-
-			    LPSMARTUPDATEPREFS lpSmartUpdatePrefs;
-
-			    if (SUCCEEDED(lpAdvancedPrefs->QueryInterface(IID_ISmartUpdatePrefs, (void **)&lpSmartUpdatePrefs))) {
-				    
-				    lpSmartUpdatePrefs->RegPack();
-				    lpSmartUpdatePrefs->Release();
-			    }
-            }
-		}
-
-		return TRUE;
-
-	} else if (id == IDC_BUTTON2 && notifyCode == BN_CLICKED) {
         LPSU_PACKAGEINFO packageInfo = NULL;
 	    HWND			 hList = GetDlgItem(m_hwndDlg, IDC_LIST1);
 	    int				 nIndex = 0;