Removal of all user tracking and shareware parts

Removal of all user tracking and shareware parts.

NOTE: Some parts were seen as "binary" by mercurial. I have fixed that, but you still might not yet see the corect diff yet.

[Wladimir Palant, 2012-12-10 11:49:13]

For reference, the change in SimpleAdblockTab.cpp is:

@@ -39,8 +39,6 @@
                                CPluginClass::s_mimeFilter =
CPluginClientFactory::GetMimeFilterClientInstance();
                        }
 
-                       settings->SetBool(SETTING_PLUGIN_REGISTRATION,
pluginConfig.IsPluginRegistered());
-                       settings->SetValue(SETTING_PLUGIN_ADBLOCKLIMIT,
pluginConfig.GetAdBlockLimit());
                        settings->Write();
                        this->OnUpdateConfig();
                        this->OnUpdateSettings(true);

And the change to PluginSystem.cpp:

@@ -1,4 +1,4 @@
-#include "PluginStdAfx.h"
+#include "PluginStdAfx.h"
 
 // Internet / FTP
 #include <wininet.h>
@@ -120,269 +120,3 @@
 
        return browserVersion;
 }
-
-
-CString CPluginSystem::GetUserName() const
-{
-    CString userName;
-
-    TCHAR name[UNLEN + 1];
-    DWORD length = UNLEN + 1;
-
-    int res = ::GetUserName(name, &length);
-    if (res != 0)
-    {
-        userName = name;
-    }
-    else
-    {
-           DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_SYSINFO,
PLUGIN_ERROR_SYSINFO_USER_NAME, L"Client::GetUserName - Failed");
-    }
-
-    return userName;
-}
-
-
-CString CPluginSystem::GetComputerName() const
-{
-    CString computerName;
-
-    TCHAR name[MAX_COMPUTERNAME_LENGTH + 1];
-    DWORD length = MAX_COMPUTERNAME_LENGTH + 1;
-
-    if (::GetComputerName(name, &length))
-    {
-        computerName = name;
-    }
-    else
-    {
-        DWORD dwError = ::GetLastError();
-
-           DEBUG_ERROR_LOG(dwError, PLUGIN_ERROR_SYSINFO,
PLUGIN_ERROR_SYSINFO_COMPUTER_NAME, L"Client::GetComputerName - Failed");
-
-        computerName.Format(L"err %u", dwError);
-    }
-
-    return computerName;
-}
-
-
-CString CPluginSystem::GetPluginId()
-{
-    CString pluginId;
-
-    s_criticalSection.Lock();
-    {
-#ifdef CONFIG_IN_REGISTRY
-                       DWORD dwResult = NULL;
-                       HKEY hKey;
-                       RegOpenKey(HKEY_CURRENT_USER,
L"SOFTWARE\\SimpleAdblock", &hKey);
-                       DWORD type = 0;
-                       WCHAR pid[250];
-                       DWORD cbData;
-                       dwResult = ::RegQueryValueEx(hKey, L"PluginId", NULL,
&type, (BYTE*)pid, &cbData);
-                       if (dwResult == ERROR_SUCCESS)
-                       {
-                               CString pluginId = pid;
-                               ::RegCloseKey(hKey);
-                               m_pluginId = pluginId;
-                       }
-#endif
-           if (m_pluginId.IsEmpty())
-           {
-#ifdef CONFIG_IN_REGISTRY
-                       RegOpenKey(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\SimpleAdblock", &hKey);
-                       type = 0;
-                       WCHAR pid[250];
-                       DWORD cbData;
-                       dwResult = ::RegQueryValueEx(hKey, L"PluginId", NULL,
&type, (BYTE*)pid, &cbData);
-                       if (dwResult == ERROR_SUCCESS)
-                       {
-                               CString pluginId = pid;
-                               ::RegCloseKey(hKey);
-                               m_pluginId = pluginId;
-                       }
-#endif
-
-                   if (m_pluginId.IsEmpty())
-                       {
-
-                               CPluginSettings* settings =
CPluginSettings::GetInstance();
-                               m_pluginId =
settings->GetString(SETTING_PLUGIN_ID, L"");
-                               if (m_pluginId.IsEmpty())
-                               {
-                                       m_pluginId = GeneratePluginId();
-                               }
-                       }
-           }
-
-        pluginId = m_pluginId;
-    }
-    s_criticalSection.Unlock();
-
-       return pluginId;
-}
-
-void CPluginSystem::SetPluginId(CString pluginId)
-{
-       m_pluginId = pluginId;
-#ifdef CONFIG_IN_REGISTRY
-                       DWORD dwResult = NULL;
-                       HKEY hKey;
-                       RegCreateKey(HKEY_CURRENT_USER,
L"SOFTWARE\\SimpleAdblock", &hKey);
-                       DWORD type = 0;
-//                     MessageBox(NULL, pluginId, L"testdemo", MB_OK);
-                       dwResult = ::RegSetValueEx(hKey, L"PluginId", NULL,
REG_SZ, (const BYTE*)pluginId.GetBuffer(), (pluginId.GetLength() * 2) + 1);
-
-                       RegCreateKey(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\SimpleAdblock", &hKey);
-                       type = 0;
-//                     MessageBox(NULL, pluginId, L"testdemo", MB_OK);
-                       dwResult = ::RegSetValueEx(hKey, L"PluginId", NULL,
REG_SZ, (const BYTE*)pluginId.GetBuffer(), (pluginId.GetLength() * 2) + 1);
-
-#endif
-
-}
-
-
-#define WORKING_BUFFER_SIZE 15000
-#define MAX_TRIES 3
-
-#define MALLOC(x) ::HeapAlloc(::GetProcessHeap(), 0, (x))
-#define FREE(x) ::HeapFree(::GetProcessHeap(), 0, (x))
-
-CString CPluginSystem::GetMacId(bool addSeparator) const
-{
-    CString id;
-
-    DWORD dwSize = 0;
-    DWORD dwRetVal = 0;
-
-    unsigned int i = 0;
-
-    // Set the flags to pass to GetAdaptersAddresses
-    ULONG flags = GAA_FLAG_INCLUDE_PREFIX;
-
-    // default to unspecified address family (both)
-    ULONG family = AF_UNSPEC;
-
-    LPVOID lpMsgBuf = NULL;
-
-    PIP_ADAPTER_ADDRESSES pAddresses = NULL;
-    ULONG outBufLen = 0;
-    ULONG Iterations = 0;
-
-    PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
-    PIP_ADAPTER_UNICAST_ADDRESS pUnicast = NULL;
-    PIP_ADAPTER_ANYCAST_ADDRESS pAnycast = NULL;
-    PIP_ADAPTER_MULTICAST_ADDRESS pMulticast = NULL;
-    IP_ADAPTER_DNS_SERVER_ADDRESS *pDnServer = NULL;
-    IP_ADAPTER_PREFIX *pPrefix = NULL;
-
-    // Allocate a 15 KB buffer to start with.
-    outBufLen = WORKING_BUFFER_SIZE;
-
-    do
-    {
-        pAddresses = (IP_ADAPTER_ADDRESSES *) MALLOC(outBufLen);
-        if (pAddresses)
-        {
-                       dwRetVal = ::GetAdaptersAddresses(family, flags, NULL,
pAddresses, &outBufLen);
-                       if (dwRetVal == ERROR_BUFFER_OVERFLOW)
-                       {
-                               FREE(pAddresses);
-                               pAddresses = NULL;
-                       }
-                       else
-                       {
-                               break;
-                       }
-               }
-
-        Iterations++;
-
-       } while (dwRetVal == ERROR_BUFFER_OVERFLOW && Iterations < MAX_TRIES);
-
-    if (dwRetVal == NO_ERROR)
-    {
-        // If successful, output some information from the data we received
-        pCurrAddresses = pAddresses;
-
-               int macCount = 0;
-
-        while (pCurrAddresses && macCount < 2)
-        {
-            if (pCurrAddresses->PhysicalAddressLength != 0)
-            {
-                CString buffer;
-
-                bool isValid = false;
-
-                for (i = 0; i < (int) pCurrAddresses->PhysicalAddressLength;
i++)
-                {
-                    if (!buffer.IsEmpty())
-                    {
-                        buffer += ':';
-                    }
-
-                    int value = pCurrAddresses->PhysicalAddress[i];
-                    if (value != 0)
-                    {
-                        isValid = true;
-                    }
-
-                    CString part;
-                    part.Format(L"%2.2x", value);
-
-                    buffer += part;
-                }
-
-                if (isValid)
-                {
-
-                    if (!id.IsEmpty() && addSeparator)
-                    {
-                               id += '-';
-                    }
-                    id += buffer;
-
-                    macCount++;
-                }
-            }
-
-            pCurrAddresses = pCurrAddresses->Next;
-        }
-    }
-    else
-    {
-               DEBUG_ERROR_LOG(dwRetVal, PLUGIN_ERROR_MAC_ID,
PLUGIN_ERROR_MAC_ID_RETRIEVAL_EX, L"Client::GetMacId - Failed
GetAdaptersAddresses");
-    }
-
-    if (pAddresses)
-    {
-        FREE(pAddresses);
-    }
-
-    return id;
-}
-
-
-CString CPluginSystem::GeneratePluginId()
-{
-       CString id = GetMacId() + GetComputerName();
-
-       // Generate SHA1 encryption
-       TCHAR szReport[100];
-
-       CStringA idA = id;
-
-       CSHA1 sha1;
-       sha1.Update((unsigned char*)idA.GetBuffer(), idA.GetLength());
-       sha1.Final();
-
-       sha1.ReportHash(szReport, CSHA1::REPORT_HEX_SHORT);
-
-       id = szReport;
-       id.MakeLower();
-
-    return id;
-}

http://codereview.adblockplus.org/8949229/diff/1/AdBlocker/AdBlocker.vcproj
File AdBlocker/AdBlocker.vcproj (right):

http://codereview.adblockplus.org/8949229/diff/1/AdBlocker/AdBlocker.vcproj#n...
AdBlocker/AdBlocker.vcproj:134: ExcludedFromBuild="true"
I'm not sure I understand these changes correctly, could you explain how they
are related?

http://codereview.adblockplus.org/8949229/diff/1/AdBlocker/SimpleAdblockDomTr...
File AdBlocker/SimpleAdblockDomTraverser.cpp (right):

http://codereview.adblockplus.org/8949229/diff/1/AdBlocker/SimpleAdblockDomTr...
AdBlocker/SimpleAdblockDomTraverser.cpp:35: }
Note for the future - indentation in this file (and probably a few others) looks
inconsistent. Four space tabs are used apparently and smart tabs are mixed with
spaces. We should convert it to spaces only to make sure that the indentation is
consistent everywhere.

[Oleksandr, 2012-12-10 14:58:33]

http://codereview.adblockplus.org/8949229/diff/1/AdBlocker/AdBlocker.vcproj
File AdBlocker/AdBlocker.vcproj (right):

http://codereview.adblockplus.org/8949229/diff/1/AdBlocker/AdBlocker.vcproj#n...
AdBlocker/AdBlocker.vcproj:134: ExcludedFromBuild="true"
We had a custom build step in a project that every time, after successful build
the resulting DLL would get copied into a place where installer would take it
and embed into the installation. That step is not needed (at least for now) so
it is excluded from build. 
On 2012/12/10 11:49:13, Wladimir Palant wrote:
> I'm not sure I understand these changes correctly, could you explain how they
> are related?