Ticket #1226: boincmgr_fix_long_pointers.patch

File boincmgr_fix_long_pointers.patch, 4.2 KB (added by amilburn, 11 years ago)

boincmgr: patch to change temporaries to long

  • clientgui/DlgOptions.cpp 

    diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp
index 01ccff7..96210d7 100644
    a b bool CDlgOptions::SaveSettings() { 
    651651    CMainDocument*      pDoc = wxGetApp().GetDocument();
    652652    CBOINCBaseFrame*    pFrame = wxGetApp().GetFrame();
    653653    CSkinAdvanced*      pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
    654     int                 iBuffer = 0;
     654    long                lBuffer = 0;
    655655    wxString            strBuffer = wxEmptyString;
    656656
    657657
    … … bool CDlgOptions::SaveSettings() { 
    731731                        pDoc->proxy_info.noproxy_hosts = (const char*)m_HTTPNoProxiesCtrl->GetValue().mb_str();
    732732                }
    733733        strBuffer = m_HTTPPortCtrl->GetValue();
    734         strBuffer.ToLong((long*)&iBuffer);
    735         pDoc->proxy_info.http_server_port = iBuffer;
     734        strBuffer.ToLong((long*)&lBuffer);
     735        pDoc->proxy_info.http_server_port = lBuffer;
    736736
    737737        pDoc->proxy_info.use_socks_proxy = m_EnableSOCKSProxyCtrl->GetValue();
    738738        pDoc->proxy_info.socks_server_name = (const char*)m_SOCKSAddressCtrl->GetValue().mb_str();
    … … bool CDlgOptions::SaveSettings() { 
    742742                        pDoc->proxy_info.noproxy_hosts = (const char*)m_SOCKSNoProxiesCtrl->GetValue().mb_str();
    743743                }
    744744        strBuffer = m_SOCKSPortCtrl->GetValue();
    745         strBuffer.ToLong((long*)&iBuffer);
    746         pDoc->proxy_info.socks_server_port = iBuffer;
     745        strBuffer.ToLong((long*)&lBuffer);
     746        pDoc->proxy_info.socks_server_port = lBuffer;
    747747
    748748        pDoc->SetProxyConfiguration();
    749749    }

  • clientgui/ProxyPage.cpp 

    diff --git a/clientgui/ProxyPage.cpp b/clientgui/ProxyPage.cpp
index d50b29a..f95c65e 100644
    a b void CErrProxyPage::OnPageChanged( wxWizardExEvent& WXUNUSED(event) ) { 
    392392void CErrProxyPage::OnPageChanging( wxWizardExEvent& event ) {
    393393    CMainDocument* pDoc = wxGetApp().GetDocument();
    394394    wxString       strBuffer = wxEmptyString;
    395     int            iBuffer = 0;
     395    long           lBuffer = 0;
    396396
    397397    wxASSERT(pDoc);
    398398    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
    … … void CErrProxyPage::OnPageChanging( wxWizardExEvent& event ) { 
    405405        pDoc->proxy_info.http_user_passwd = (const char*)m_pProxyHTTPPasswordCtrl->GetValue().mb_str();
    406406
    407407        strBuffer = m_pProxyHTTPPortCtrl->GetValue();
    408         strBuffer.ToLong((long*)&iBuffer);
    409         pDoc->proxy_info.http_server_port = iBuffer;
     408        strBuffer.ToLong((long*)&lBuffer);
     409        pDoc->proxy_info.http_server_port = lBuffer;
    410410
    411411        pDoc->proxy_info.use_socks_proxy = (m_pProxySOCKSServerCtrl->GetValue().Length() > 0);
    412412        pDoc->proxy_info.socks_server_name = (const char*)m_pProxySOCKSServerCtrl->GetValue().mb_str();
    … … void CErrProxyPage::OnPageChanging( wxWizardExEvent& event ) { 
    414414        pDoc->proxy_info.socks5_user_passwd = (const char*)m_pProxySOCKSPasswordCtrl->GetValue().mb_str();
    415415
    416416        strBuffer = m_pProxySOCKSPortCtrl->GetValue();
    417         strBuffer.ToLong((long*)&iBuffer);
    418         pDoc->proxy_info.socks_server_port = iBuffer;
     417        strBuffer.ToLong((long*)&lBuffer);
     418        pDoc->proxy_info.socks_server_port = lBuffer;
    419419
    420420        pDoc->SetProxyConfiguration();
    421421    }

  • clientgui/ViewProjects.cpp 

    diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index 353ff29..5cc8d92 100644
    a b wxInt32 CViewProjects::ConvertWebsiteIndexToLink(wxInt32 iProjectIndex, wxInt32 
    11871187wxInt32 CViewProjects::ConvertLinkToWebsiteIndex(const wxString& strLink, wxInt32& iProjectIndex, wxInt32& iWebsiteIndex) {
    11881188    wxString strTemplate = strLink;
    11891189    wxString strBuffer = wxEmptyString;
     1190    long lProjectIndex, lWebsiteIndex;
    11901191
    11911192    strTemplate.Replace(wxT("web:"), wxEmptyString);
    11921193
    11931194    strBuffer = strTemplate;
    11941195    strBuffer.Remove(strBuffer.Find(wxT(":")));
    1195     strBuffer.ToLong((long*) &iProjectIndex);
     1196    strBuffer.ToLong((long*) &lProjectIndex);
     1197    iProjectIndex = lProjectIndex;
    11961198
    11971199    strBuffer = strTemplate;
    11981200    strBuffer = strBuffer.Mid(strBuffer.Find(wxT(":")) + 1);
    1199     strBuffer.ToLong((long*) &iWebsiteIndex);
     1201    strBuffer.ToLong((long*) &lWebsiteIndex);
     1202    iWebsiteIndex = lWebsiteIndex;
    12001203
    12011204    return 0;
    12021205}