diff --git a/AsyncSocketEx.cpp b/AsyncSocketEx.cpp index 37af2787..08433a64 100644 --- a/AsyncSocketEx.cpp +++ b/AsyncSocketEx.cpp @@ -274,9 +274,6 @@ class CAsyncSocketExHelperWindow // Ignore further FD_READ events after FD_CLOSE has been received if (pSocket->m_SocketData.onCloseCalled) break; -#endif //NOSOCKETSTATES - -#ifndef NOSOCKETSTATES if (nErrorCode) pSocket->SetState(aborted); #endif //NOSOCKETSTATES @@ -379,7 +376,7 @@ class CAsyncSocketExHelperWindow pSocket->OnClose(nErrorCode); break; } - } else { //Dispatch notification to the lowest layer + } else { //Dispatch notification to the lower layer if (nEvent == FD_READ) { // Ignore further FD_READ events after FD_CLOSE has been received if (pSocket->m_SocketData.onCloseCalled) @@ -498,12 +495,10 @@ class CAsyncSocketExHelperWindow pSocket->OnConnect(nErrorCode); #ifndef NOSOCKETSTATES - if (!nErrorCode) { - if (((pSocket->m_nPendingEvents&FD_READ) && pSocket->GetState() == connected) && (pSocket->m_lEvent & FD_READ)) - pSocket->OnReceive(0); - if (((pSocket->m_nPendingEvents&FD_FORCEREAD) && pSocket->GetState() == connected) && (pSocket->m_lEvent & FD_READ)) - pSocket->OnReceive(0); - if (((pSocket->m_nPendingEvents&FD_WRITE) && pSocket->GetState() == connected) && (pSocket->m_lEvent & FD_WRITE)) + if (!nErrorCode && pSocket->GetState() == connected) { + if (pSocket->m_nPendingEvents & (FD_READ | FD_FORCEREAD) && pSocket->m_lEvent & FD_READ) + pSocket->OnReceive(0); + if (pSocket->m_nPendingEvents & FD_WRITE && pSocket->m_lEvent & FD_WRITE) pSocket->OnSend(0); } pSocket->m_nPendingEvents = 0; @@ -750,7 +745,7 @@ bool CAsyncSocketEx::Create(UINT nSocketPort /*=0*/, int nSocketType /*=SOCK_STR if (reusable && nSocketPort != 0) { BOOL value = TRUE; - SetSockOpt(SO_REUSEADDR, reinterpret_cast(&value), sizeof value); + SetSockOpt(SO_REUSEADDR, reinterpret_cast(&value), sizeof value); } if (!Bind(nSocketPort, sSocketAddress)) { @@ -1006,23 +1001,22 @@ bool CAsyncSocketEx::Connect(const CString &sHostAddress, UINT nHostPort) bool ret = false; for (m_SocketData.nextAddr = m_SocketData.addrInfo; m_SocketData.nextAddr; m_SocketData.nextAddr = m_SocketData.nextAddr->ai_next) { - bool newSocket = (m_SocketData.nFamily != AF_UNSPEC); + bool newSocket = (m_SocketData.nFamily == AF_UNSPEC); if (newSocket) m_SocketData.hSocket = socket(m_SocketData.nextAddr->ai_family, m_SocketData.nextAddr->ai_socktype, m_SocketData.nextAddr->ai_protocol); - if (m_SocketData.hSocket == INVALID_SOCKET) continue; - m_SocketData.nFamily = (ADDRESS_FAMILY)m_SocketData.nextAddr->ai_family; - AttachHandle(); + if (newSocket) { + m_SocketData.nFamily = (ADDRESS_FAMILY)m_SocketData.nextAddr->ai_family; + AttachHandle(); + } - if (AsyncSelect(m_lEvent)) - if (!m_pFirstLayer || !WSAAsyncSelect(m_SocketData.hSocket, GetHelperWindowHandle(), m_SocketData.nSocketIndex + WM_SOCKETEX_NOTIFY, FD_SIX_EVENTS)) - if (Bind(m_nSocketPort, m_sSocketAddress)) { - ret = Connect(m_SocketData.nextAddr->ai_addr, (int)m_SocketData.nextAddr->ai_addrlen); - if (ret || GetLastError() == WSAEWOULDBLOCK) - break; - } + if (AsyncSelect(m_lEvent) && (!newSocket || Bind(m_nSocketPort, m_sSocketAddress))) { + ret = Connect(m_SocketData.nextAddr->ai_addr, (int)m_SocketData.nextAddr->ai_addrlen); + if (ret || GetLastError() == WSAEWOULDBLOCK) + break; + } if (newSocket) { m_SocketData.nFamily = AF_UNSPEC; @@ -1265,9 +1259,10 @@ void CAsyncSocketEx::RemoveAllLayers() int CAsyncSocketEx::OnLayerCallback(std::list &callbacks) { - for (std::list::const_iterator iter = callbacks.begin(); iter != callbacks.end(); ++iter) - delete[] iter->str; - callbacks.clear(); + while (callbacks.begin() != callbacks.end()) { + delete[] callbacks.begin()->str; + callbacks.pop_front(); + } return 0; } diff --git a/ClientUDPSocket.cpp b/ClientUDPSocket.cpp index 6c10b942..efe4846f 100644 --- a/ClientUDPSocket.cpp +++ b/ClientUDPSocket.cpp @@ -515,7 +515,8 @@ SocketSentBytes CClientUDPSocket::SendControlData(uint32 maxNumberOfBytesToSend, nLen = EncryptSendClient(sendbuffer, nLen, cur_packet->pachTargetClientHashORKadID, cur_packet->bKad, cur_packet->nReceiverVerifyKey, (cur_packet->bKad ? Kademlia::CPrefs::GetUDPVerifyKey(cur_packet->dwIP) : 0u)); //DEBUG_ONLY( AddDebugLogLine(DLP_VERYLOW, false, _T("Sent obfuscated UDP packet to clientIP: %s, Kad: %s, ReceiverKey: %u"), (LPCTSTR)ipstr(cur_packet->dwIP), cur_packet->bKad ? _T("Yes") : _T("No"), cur_packet->nReceiverVerifyKey) ); } - if (SendTo(sendbuffer, nLen, cur_packet->dwIP, cur_packet->nPort) >= 0) { + cLen = SendTo(sendbuffer, nLen, cur_packet->dwIP, cur_packet->nPort); + if (cLen >= 0) { sentBytes += nLen; // ZZ:UploadBandWithThrottler (UDP) delete cur_packet->packet; delete cur_packet; @@ -538,19 +539,22 @@ SocketSentBytes CClientUDPSocket::SendControlData(uint32 maxNumberOfBytesToSend, // <-- ZZ:UploadBandWithThrottler (UDP) } -int CClientUDPSocket::SendTo(uchar* lpBuf, int nBufLen, uint32 dwIP, uint16 nPort) +int CClientUDPSocket::SendTo(uchar *lpBuf, int nBufLen, uint32 dwIP, uint16 nPort) { // NOTE: *** This function is invoked from a *different* thread! //Currently called only locally; sendLocker must be locked by the caller int result = CAsyncSocket::SendTo(lpBuf, nBufLen, nPort, ipstr(dwIP)); if (result == SOCKET_ERROR) { - DWORD dwError = GetLastError(); - if (dwError == WSAEWOULDBLOCK) + DWORD dwError = (DWORD)CAsyncSocket::GetLastError(); + if (dwError == WSAEWOULDBLOCK) { m_bWouldBlock = true; + return -1; //blocked + } if (thePrefs.GetVerbose()) DebugLogError(_T("Error: Client UDP socket, failed to send data to %s:%u: %s"), (LPCTSTR)ipstr(dwIP), nPort, (LPCTSTR)GetErrorMessage(dwError, 1)); + return 0; //error } - return result; + return result; //success } bool CClientUDPSocket::SendPacket(Packet *packet, uint32 dwIP, uint16 nPort, bool bEncrypt, const uchar* pachTargetClientHashORKadID, bool bKad, uint32 nReceiverVerifyKey) diff --git a/CollectionFile.cpp b/CollectionFile.cpp index 78488d86..f16d1df3 100644 --- a/CollectionFile.cpp +++ b/CollectionFile.cpp @@ -124,7 +124,6 @@ bool CCollectionFile::InitFromLink(const CString& sLink) delete pLink; return false; } - delete pLink; taglist.Add(new CTag(FT_FILEHASH, pFileLink->GetHashKey())); m_FileIdentifier.SetMD4Hash(pFileLink->GetHashKey()); @@ -140,6 +139,7 @@ bool CCollectionFile::InitFromLink(const CString& sLink) m_FileIdentifier.SetAICHHash(pFileLink->GetAICHHash()); } + delete pLink; return true; } diff --git a/CreditsThread.cpp b/CreditsThread.cpp index 870d286f..275ea9ec 100644 --- a/CreditsThread.cpp +++ b/CreditsThread.cpp @@ -432,7 +432,7 @@ void CCreditsThread::InitText() m_arCredits.Add(_T("03:00:eMule")); m_arCredits.Add(_T("02:01:Version ") + theApp.m_strCurVersionLong); - m_arCredits.Add(_T("01:06:Copyright (C) 2002-2018 Merkur")); + m_arCredits.Add(_T("01:06:Copyright (C) 2002-2019 Merkur")); m_arCredits.Add(_T("S:50")); m_arCredits.Add(_T("02:04:Developers")); m_arCredits.Add(_T("S:5")); diff --git a/FileInfoDialog.cpp b/FileInfoDialog.cpp index be68533d..cc7ea1c9 100644 --- a/FileInfoDialog.cpp +++ b/FileInfoDialog.cpp @@ -230,7 +230,7 @@ class CMediaInfoDLL m_pfnMediaInfo_Get = NULL; m_pfnMediaInfo_Count_Get = NULL; } - else if (ullVersion < MAKEDLLVERULL(18, 6, 0, 0)) //here ullVersion >= 7.0 + else if (ullVersion < MAKEDLLVERULL(18, 13, 0, 0)) //here ullVersion >= 7.0 { (FARPROC &)m_pfnMediaInfo_New = GetProcAddress(m_hLib, "MediaInfo_New"); (FARPROC &)m_pfnMediaInfo_Delete = GetProcAddress(m_hLib, "MediaInfo_Delete"); diff --git a/PPgScheduler.cpp b/PPgScheduler.cpp index a873294c..82c87ebd 100644 --- a/PPgScheduler.cpp +++ b/PPgScheduler.cpp @@ -50,11 +50,7 @@ CPPgScheduler::CPPgScheduler() { } -CPPgScheduler::~CPPgScheduler() -{ -} - -void CPPgScheduler::DoDataExchange(CDataExchange* pDX) +void CPPgScheduler::DoDataExchange(CDataExchange *pDX) { CPropertyPage::DoDataExchange(pDX); DDX_Control(pDX, IDC_TIMESEL, m_timesel); @@ -70,20 +66,20 @@ BOOL CPPgScheduler::OnInitDialog() InitWindowStyles(this); m_list.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP); - ASSERT( (m_list.GetStyle() & LVS_SINGLESEL) == 0); - m_list.InsertColumn(0, GetResString(IDS_TITLE), LVCFMT_LEFT, 150); - m_list.InsertColumn(1, GetResString(IDS_S_DAYS), LVCFMT_LEFT, 80); - m_list.InsertColumn(2, GetResString(IDS_STARTTIME), LVCFMT_LEFT, 80); + ASSERT((m_list.GetStyle() & LVS_SINGLESEL) == 0); + m_list.InsertColumn(0, GetResString(IDS_TITLE), LVCFMT_LEFT, 150); + m_list.InsertColumn(1, GetResString(IDS_S_DAYS), LVCFMT_LEFT, 80); + m_list.InsertColumn(2, GetResString(IDS_STARTTIME), LVCFMT_LEFT, 80); m_time.SetFormat(_T("H:mm")); m_timeTo.SetFormat(_T("H:mm")); m_actions.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP); - ASSERT( (m_actions.GetStyle() & LVS_SINGLESEL) == 0 ); + ASSERT((m_actions.GetStyle() & LVS_SINGLESEL) == 0); m_actions.InsertColumn(0, GetResString(IDS_ACTION), LVCFMT_LEFT, 150); - m_actions.InsertColumn(1, GetResString(IDS_VALUE), LVCFMT_LEFT, 80); + m_actions.InsertColumn(1, GetResString(IDS_VALUE), LVCFMT_LEFT, 80); Localize(); - CheckDlgButton(IDC_ENABLE,thePrefs.IsSchedulerEnabled()); + CheckDlgButton(IDC_ENABLE, thePrefs.IsSchedulerEnabled()); FillScheduleList(); return TRUE; // return TRUE unless you set the focus to a control @@ -92,8 +88,7 @@ BOOL CPPgScheduler::OnInitDialog() void CPPgScheduler::Localize() { - if(m_hWnd) - { + if (m_hWnd) { SetWindowText(GetResString(IDS_SCHEDULER)); SetDlgItemText(IDC_ENABLE, GetResString(IDS_ENABLED)); @@ -110,7 +105,7 @@ void CPPgScheduler::Localize() while (m_timesel.GetCount() > 0) m_timesel.DeleteString(0); - for (int i=0; i<11; ++i) + for (int i = 0; i < 11; ++i) m_timesel.AddString(GetDayLabel(i)); m_timesel.SetCurSel(0); if (m_list.GetSelectionMark() != -1) @@ -118,7 +113,7 @@ void CPPgScheduler::Localize() } } -void CPPgScheduler::OnNmClickList(NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/) +void CPPgScheduler::OnNmClickList(NMHDR*, LRESULT*) { if (m_list.GetSelectionMark() > -1) LoadSchedule(m_list.GetSelectionMark()); @@ -126,7 +121,7 @@ void CPPgScheduler::OnNmClickList(NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/) void CPPgScheduler::LoadSchedule(int index) { - Schedule_Struct* schedule = theApp.scheduler->GetSchedule(index); + Schedule_Struct *schedule = theApp.scheduler->GetSchedule(index); SetDlgItemText(IDC_S_TITLE, schedule->title); //time @@ -144,12 +139,12 @@ void CPPgScheduler::LoadSchedule(int index) m_timesel.SetCurSel(schedule->day); CheckDlgButton(IDC_S_ENABLE, (schedule->enabled)); - CheckDlgButton(IDC_CHECKNOENDTIME, schedule->time2==0); + CheckDlgButton(IDC_CHECKNOENDTIME, schedule->time2 == 0); OnDisableTime2(); m_actions.DeleteAllItems(); - for (int i = 0; i<16 && !schedule->actions[i]; ++i) { + for (int i = 0; i < 16 && schedule->actions[i]; ++i) { m_actions.InsertItem(i, GetActionLabel(schedule->actions[i])); m_actions.SetItemText(i, 1, schedule->values[i]); m_actions.SetItemData(i, schedule->actions[i]); @@ -160,7 +155,7 @@ void CPPgScheduler::FillScheduleList() { m_list.DeleteAllItems(); - for (int index = 0; indexGetCount(); ++index) { + for (int index = 0; index < theApp.scheduler->GetCount(); ++index) { const Schedule_Struct *schedule = theApp.scheduler->GetSchedule(index); m_list.InsertItem(index, schedule->title); CTime time(schedule->time); @@ -168,7 +163,7 @@ void CPPgScheduler::FillScheduleList() m_list.SetItemText(index, 1, GetDayLabel(schedule->day)); m_list.SetItemText(index, 2, timeS); } - if (m_list.GetItemCount()>0) { + if (m_list.GetItemCount() > 0) { m_list.SetSelectionMark(0); m_list.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED); LoadSchedule(0); @@ -177,15 +172,12 @@ void CPPgScheduler::FillScheduleList() void CPPgScheduler::OnBnClickedAdd() { - Schedule_Struct* newschedule=new Schedule_Struct(); - newschedule->day=0; - newschedule->enabled=false; + Schedule_Struct *newschedule = new Schedule_Struct(); newschedule->time2 = newschedule->time = time(NULL); - newschedule->title=_T("?"); - newschedule->ResetActions(); + newschedule->title = _T("?"); int index = (int)theApp.scheduler->AddSchedule(newschedule); - m_list.InsertItem(index, newschedule->title ); + m_list.InsertItem(index, newschedule->title); m_list.SetSelectionMark(index); RecheckSchedules(); @@ -193,37 +185,37 @@ void CPPgScheduler::OnBnClickedAdd() void CPPgScheduler::OnBnClickedApply() { - int index=m_list.GetSelectionMark(); + int index = m_list.GetSelectionMark(); - if (index>-1) { - Schedule_Struct* schedule=theApp.scheduler->GetSchedule(index); + if (index > -1) { + Schedule_Struct *schedule = theApp.scheduler->GetSchedule(index); //title GetDlgItemText(IDC_S_TITLE, schedule->title); //time CTime myTime; - DWORD result=m_time.GetTime(myTime); - if (result == GDT_VALID){ + DWORD result = m_time.GetTime(myTime); + if (result == GDT_VALID) { struct tm tmTemp; - schedule->time=safe_mktime(myTime.GetLocalTm(&tmTemp)); + schedule->time = safe_mktime(myTime.GetLocalTm(&tmTemp)); } CTime myTime2; - DWORD result2=m_timeTo.GetTime(myTime2); - if (result2 == GDT_VALID){ + DWORD result2 = m_timeTo.GetTime(myTime2); + if (result2 == GDT_VALID) { struct tm tmTemp; - schedule->time2=safe_mktime(myTime2.GetLocalTm(&tmTemp)); + schedule->time2 = safe_mktime(myTime2.GetLocalTm(&tmTemp)); } - if (IsDlgButtonChecked(IDC_CHECKNOENDTIME)) schedule->time2=0; - + if (IsDlgButtonChecked(IDC_CHECKNOENDTIME)) + schedule->time2 = 0; //time kindof (days) - schedule->day=m_timesel.GetCurSel(); - schedule->enabled=IsDlgButtonChecked(IDC_S_ENABLE)!=0; + schedule->day = m_timesel.GetCurSel(); + schedule->enabled = IsDlgButtonChecked(IDC_S_ENABLE) != 0; schedule->ResetActions(); - for (int i=0; i= 0;) { schedule->actions[i] = (int)m_actions.GetItemData(i); - schedule->values[i]=m_actions.GetItemText(i,1); + schedule->values[i] = m_actions.GetItemText(i, 1); } m_list.SetItemText(index, 0, schedule->title); @@ -239,7 +231,7 @@ void CPPgScheduler::OnBnClickedRemove() { int index = m_list.GetSelectionMark(); - if (index!=-1) + if (index != -1) theApp.scheduler->RemoveSchedule(index); FillScheduleList(); theApp.scheduler->RestoreOriginals(); @@ -327,18 +319,18 @@ CString CPPgScheduler::GetDayLabel(int index) return GetResString(uid); } -void CPPgScheduler::OnNmDblClkActionlist(NMHDR* /*pNMHDR*/, LRESULT* pResult) +void CPPgScheduler::OnNmDblClkActionlist(NMHDR*, LRESULT *pResult) { - if (m_actions.GetSelectionMark()!=-1) { + if (m_actions.GetSelectionMark() != -1) { DWORD_PTR ac = m_actions.GetItemData(m_actions.GetSelectionMark()); - if (ac!=6 && ac!=7) + if (ac != ACTION_CATSTOP && ac != ACTION_CATRESUME) OnCommand(MP_CAT_EDIT, 0); } *pResult = 0; } -void CPPgScheduler::OnNmRClickActionlist(NMHDR* /*pNMHDR*/, LRESULT* pResult) +void CPPgScheduler::OnNmRClickActionlist(NMHDR*, LRESULT *pResult) { POINT point; ::GetCursorPos(&point); @@ -347,131 +339,110 @@ void CPPgScheduler::OnNmRClickActionlist(NMHDR* /*pNMHDR*/, LRESULT* pResult) CMenu m_ActionSel; CMenu m_CatActionSel; - bool isCatAction=false; - if (m_actions.GetSelectionMark()!=-1) { - DWORD_PTR ac=m_actions.GetItemData(m_actions.GetSelectionMark()); - if (ac==6 || ac==7) - isCatAction=true; + bool isCatAction = false; + if (m_actions.GetSelectionMark() != -1) { + DWORD_PTR ac = m_actions.GetItemData(m_actions.GetSelectionMark()); + if (ac == ACTION_CATSTOP || ac == ACTION_CATRESUME) + isCatAction = true; } m_ActionMenu.CreatePopupMenu(); m_ActionSel.CreatePopupMenu(); m_CatActionSel.CreatePopupMenu(); - UINT nFlag=MF_STRING; - if (m_actions.GetSelectionMark()==-1) nFlag=MF_STRING | MF_GRAYED; + UINT nFlag = (m_actions.GetSelectionMark() == -1) ? MF_STRING | MF_GRAYED : MF_STRING; - m_ActionSel.AppendMenu(MF_STRING,MP_SCHACTIONS+ACTION_SETUPL,GetResString(IDS_PW_UPL)); - m_ActionSel.AppendMenu(MF_STRING,MP_SCHACTIONS+ACTION_SETDOWNL,GetResString(IDS_PW_DOWNL)); - m_ActionSel.AppendMenu(MF_STRING,MP_SCHACTIONS+ACTION_SOURCESL,GetResString(IDS_LIMITSOURCES)); - m_ActionSel.AppendMenu(MF_STRING,MP_SCHACTIONS+ACTION_CON5SEC,GetResString(IDS_LIMITCONS5SEC)); - m_ActionSel.AppendMenu(MF_STRING,MP_SCHACTIONS+ACTION_CONS,GetResString(IDS_PW_MAXC)); - m_ActionSel.AppendMenu(MF_STRING,MP_SCHACTIONS+ACTION_CATSTOP,GetResString(IDS_SCHED_CATSTOP)); - m_ActionSel.AppendMenu(MF_STRING,MP_SCHACTIONS+ACTION_CATRESUME,GetResString(IDS_SCHED_CATRESUME)); + m_ActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + ACTION_SETUPL, GetResString(IDS_PW_UPL)); + m_ActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + ACTION_SETDOWNL, GetResString(IDS_PW_DOWNL)); + m_ActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + ACTION_SOURCESL, GetResString(IDS_LIMITSOURCES)); + m_ActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + ACTION_CON5SEC, GetResString(IDS_LIMITCONS5SEC)); + m_ActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + ACTION_CONS, GetResString(IDS_PW_MAXC)); + m_ActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + ACTION_CATSTOP, GetResString(IDS_SCHED_CATSTOP)); + m_ActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + ACTION_CATRESUME, GetResString(IDS_SCHED_CATRESUME)); m_ActionMenu.AddMenuTitle(GetResString(IDS_ACTION)); m_ActionMenu.AppendMenu(MF_POPUP, (UINT_PTR)m_ActionSel.m_hMenu, GetResString(IDS_ADD)); if (isCatAction) { - if (thePrefs.GetCatCount()>1) m_CatActionSel.AppendMenu(MF_STRING,MP_SCHACTIONS+20,GetResString(IDS_ALLUNASSIGNED)); - m_CatActionSel.AppendMenu(MF_STRING,MP_SCHACTIONS+21,GetResString(IDS_ALL)); - for (int i=1;istrTitle); - m_ActionMenu.AppendMenu(MF_POPUP, (UINT_PTR)m_CatActionSel.m_hMenu, GetResString(IDS_SELECTCAT)); + if (thePrefs.GetCatCount() > 1) + m_CatActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + 20, GetResString(IDS_ALLUNASSIGNED)); + m_CatActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + 21, GetResString(IDS_ALL)); + for (int i = 1; i < thePrefs.GetCatCount(); ++i) + m_CatActionSel.AppendMenu(MF_STRING, MP_SCHACTIONS + 22 + i, thePrefs.GetCategory(i)->strTitle); + m_ActionMenu.AppendMenu(MF_POPUP, (UINT_PTR)m_CatActionSel.m_hMenu, GetResString(IDS_SELECTCAT)); } else - m_ActionMenu.AppendMenu(nFlag,MP_CAT_EDIT, GetResString(IDS_EDIT)); + m_ActionMenu.AppendMenu(nFlag, MP_CAT_EDIT, GetResString(IDS_EDIT)); + m_ActionMenu.AppendMenu(nFlag, MP_CAT_REMOVE, GetResString(IDS_REMOVE)); - m_ActionMenu.AppendMenu(nFlag,MP_CAT_REMOVE,GetResString(IDS_REMOVE)); - - m_ActionMenu.TrackPopupMenu(TPM_LEFTALIGN |TPM_RIGHTBUTTON, point.x, point.y, this); - VERIFY( m_ActionSel.DestroyMenu() ); - VERIFY( m_CatActionSel.DestroyMenu() ); - VERIFY( m_ActionMenu.DestroyMenu() ); + m_ActionMenu.TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y, this); + VERIFY(m_ActionSel.DestroyMenu()); + VERIFY(m_CatActionSel.DestroyMenu()); + VERIFY(m_ActionMenu.DestroyMenu()); *pResult = 0; } BOOL CPPgScheduler::OnCommand(WPARAM wParam, LPARAM lParam) { - int item= m_actions.GetSelectionMark(); + int item = m_actions.GetSelectionMark(); // add - if (wParam>=MP_SCHACTIONS && wParam= MP_SCHACTIONS && wParam < MP_SCHACTIONS + 20 && m_actions.GetItemCount() < 16) { + int action = (int)(wParam - MP_SCHACTIONS); + int i = m_actions.GetItemCount(); + m_actions.InsertItem(i, GetActionLabel(action)); + m_actions.SetItemData(i, action); m_actions.SetSelectionMark(i); - if (action<6) - OnCommand(MP_CAT_EDIT,0); - } - else if (wParam>=MP_SCHACTIONS+20 && wParam<=MP_SCHACTIONS+80) - { + if (action < ACTION_CATSTOP) + OnCommand(MP_CAT_EDIT, 0); + } else if (wParam >= MP_SCHACTIONS + 20 && wParam <= MP_SCHACTIONS + 80) { CString newval; - newval.Format(_T("%u"), (unsigned)(wParam-MP_SCHACTIONS-22)); - m_actions.SetItemText(item,1,newval); - } - else if (wParam == ID_HELP) - { + newval.Format(_T("%i"), (int)(wParam - MP_SCHACTIONS - 22)); + m_actions.SetItemText(item, 1, newval); + } else if (wParam == ID_HELP) { OnHelp(); return TRUE; } - switch (wParam){ - case MP_CAT_EDIT: - { - if (item!=-1) { - InputBox inputbox; - // todo: differen prompts - CString prompt; - switch (m_actions.GetItemData(item)) { - case 1: - case 2: - prompt.Format(_T("%s (%s)"), (LPCTSTR)GetResString(IDS_SCHED_ENTERDATARATELIMIT), (LPCTSTR)GetResString(IDS_KBYTESPERSEC)); - break; - default: - prompt = GetResString(IDS_SCHED_ENTERVAL); - } - inputbox.SetLabels(GetResString(IDS_SCHED_ACTCONFIG), prompt, m_actions.GetItemText(item,1)); - inputbox.DoModal(); - if (!inputbox.WasCancelled()) { - CString res = inputbox.GetInput(); - m_actions.SetItemText(item, 1, res); - } - } - break; - } - case MP_CAT_REMOVE: - { - // remove - if (item!=-1) { - int ix=m_actions.GetSelectionMark(); - if (ix!=-1) { - m_actions.DeleteItem(ix); - } - } - break; + if (item != -1) + if (wParam == MP_CAT_EDIT) { + InputBox inputbox; + CString prompt; + int action = (int)m_actions.GetItemData(item); + if (action == ACTION_SETUPL || action == ACTION_SETDOWNL) + prompt.Format(_T("%s (%s, %s)"), (LPCTSTR)GetResString(IDS_SCHED_ENTERDATARATELIMIT), (LPCTSTR)GetActionLabel(action), (LPCTSTR)GetResString(IDS_KBYTESPERSEC)); + else + prompt.Format(_T("%s (%s)"), (LPCTSTR)GetResString(IDS_SCHED_ENTERVAL), (LPCTSTR)GetActionLabel(action)); + inputbox.SetLabels(GetResString(IDS_SCHED_ACTCONFIG), prompt, m_actions.GetItemText(item, 1)); + inputbox.DoModal(); + if (!inputbox.WasCancelled()) + m_actions.SetItemText(item, 1, inputbox.GetInput()); + } else if (wParam == MP_CAT_REMOVE) { // remove + int i = m_actions.GetSelectionMark(); + if (i != -1) + m_actions.DeleteItem(i); } - } - return CPropertyPage::OnCommand(wParam, lParam); + return CPropertyPage::OnCommand(wParam, lParam); } -void CPPgScheduler::RecheckSchedules() { +void CPPgScheduler::RecheckSchedules() +{ theApp.scheduler->Check(true); } -void CPPgScheduler::OnEnableChange() { - thePrefs.scheduler=IsDlgButtonChecked(IDC_ENABLE)!=0; - if (!thePrefs.scheduler) theApp.scheduler->RestoreOriginals(); - +void CPPgScheduler::OnEnableChange() +{ + thePrefs.scheduler = IsDlgButtonChecked(IDC_ENABLE) != 0; + if (!thePrefs.scheduler) + theApp.scheduler->RestoreOriginals(); RecheckSchedules(); theApp.emuledlg->preferenceswnd->m_wndConnection.LoadSettings(); SetModified(); } -void CPPgScheduler::OnDisableTime2() { - GetDlgItem(IDC_DATETIMEPICKER2)->EnableWindow( IsDlgButtonChecked(IDC_CHECKNOENDTIME)==0 ); +void CPPgScheduler::OnDisableTime2() +{ + GetDlgItem(IDC_DATETIMEPICKER2)->EnableWindow(IsDlgButtonChecked(IDC_CHECKNOENDTIME) == 0); } void CPPgScheduler::OnHelp() @@ -479,7 +450,7 @@ void CPPgScheduler::OnHelp() theApp.ShowHelp(eMule_FAQ_Preferences_Scheduler); } -BOOL CPPgScheduler::OnHelpInfo(HELPINFO* /*pHelpInfo*/) +BOOL CPPgScheduler::OnHelpInfo(HELPINFO*) { OnHelp(); return TRUE; diff --git a/PPgScheduler.h b/PPgScheduler.h index 32f6eb2d..9ad75953 100644 --- a/PPgScheduler.h +++ b/PPgScheduler.h @@ -4,11 +4,14 @@ class CPPgScheduler : public CPropertyPage { DECLARE_DYNAMIC(CPPgScheduler) - enum { IDD = IDD_PPG_SCHEDULER }; + enum + { + IDD = IDD_PPG_SCHEDULER + }; public: CPPgScheduler(); - virtual ~CPPgScheduler(); + virtual ~CPPgScheduler() = default; void Localize(); @@ -25,21 +28,21 @@ class CPPgScheduler : public CPropertyPage void RecheckSchedules(); void FillScheduleList(); - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + virtual void DoDataExchange(CDataExchange *pDX); // DDX/DDV support virtual BOOL OnInitDialog(); virtual BOOL OnApply(); virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); DECLARE_MESSAGE_MAP() - afx_msg BOOL OnHelpInfo(HELPINFO* pHelpInfo); + afx_msg BOOL OnHelpInfo(HELPINFO*); afx_msg void OnBnClickedAdd(); afx_msg void OnBnClickedApply(); afx_msg void OnBnClickedRemove(); afx_msg void OnDisableTime2(); afx_msg void OnEnableChange(); afx_msg void OnHelp(); - afx_msg void OnNmClickList(NMHDR *pNMHDR, LRESULT *pResult); - afx_msg void OnNmDblClkActionlist(NMHDR *pNMHDR, LRESULT *pResult); - afx_msg void OnNmRClickActionlist(NMHDR *pNMHDR, LRESULT *pResult); - afx_msg void OnSettingsChange() {SetModified();} -}; + afx_msg void OnNmClickList(NMHDR*, LRESULT*); + afx_msg void OnNmDblClkActionlist(NMHDR*, LRESULT *pResult); + afx_msg void OnNmRClickActionlist(NMHDR*, LRESULT *pResult); + afx_msg void OnSettingsChange() { SetModified(); } +}; \ No newline at end of file diff --git a/PPgWebServer.cpp b/PPgWebServer.cpp index 8aa7fa2c..f9e97d05 100644 --- a/PPgWebServer.cpp +++ b/PPgWebServer.cpp @@ -159,7 +159,7 @@ int CertCreate(const struct options &opt) goto exit; } - //generated the key + //generate the key ret = KeyCreate(&issuer_key, &ctr_drbg, opt.issuer_key); if (ret) goto exit; diff --git a/PartFile.cpp b/PartFile.cpp index c20b7c33..2c71edc0 100644 --- a/PartFile.cpp +++ b/PartFile.cpp @@ -3241,6 +3241,13 @@ void CPartFile::DeleteFile() m_bDeleteAfterAlloc = true; return; } + if (GetFileOp() != PFOP_NONE) { //hashing, copying, uncompressing + if (!m_bDeleteAfterAlloc) { + LogWarning(LOG_STATUSBAR, _T("File '%s' will be deleted after the current operation was completed"), (LPCTSTR)GetFileName()); + m_bDeleteAfterAlloc = true; //reusing flag + } + return; + } theApp.sharedfiles->RemoveFile(this, true); theApp.downloadqueue->RemoveFile(this); diff --git a/Scheduler.cpp b/Scheduler.cpp index aabd3c49..d56339a9 100644 --- a/Scheduler.cpp +++ b/Scheduler.cpp @@ -31,13 +31,15 @@ static char THIS_FILE[] = __FILE__; #endif -CScheduler::CScheduler(){ +CScheduler::CScheduler() +{ LoadFromFile(); SaveOriginals(); - m_iLastCheckedMinute=60; + m_iLastCheckedMinute = 60; } -CScheduler::~CScheduler(){ +CScheduler::~CScheduler() +{ SaveToFile(); RemoveAll(); } @@ -53,10 +55,10 @@ int CScheduler::LoadFromFile() UINT count; for (count = 0; count < max; ++count) { strName.Format(_T("Schedule#%u"), count); - CString temp = ini.GetString(_T("Title"), _T(""), strName); + const CString &temp = ini.GetString(_T("Title"), _T(""), strName); if (temp.IsEmpty()) break; - Schedule_Struct* news = new Schedule_Struct(); + Schedule_Struct *news = new Schedule_Struct(); news->title = temp; news->day = ini.GetInt(_T("Day"), 0); news->enabled = ini.GetBool(_T("Enabled")); @@ -74,11 +76,11 @@ void CScheduler::SaveToFile() CIni ini(thePrefs.GetConfigFile(), _T("Scheduler")); ini.WriteInt(_T("Count"), (int)GetCount()); - for (int i=0; iGetSchedule(i); CString temp; temp.Format(_T("Schedule#%i"), i); - ini.WriteString(_T("Title"), schedule->title,temp); + ini.WriteString(_T("Title"), schedule->title, temp); ini.WriteInt(_T("Day"), schedule->day); ini.WriteInt(_T("StartTime"), (int)schedule->time); ini.WriteInt(_T("EndTime"), (int)schedule->time2); @@ -103,17 +105,18 @@ void CScheduler::RemoveAll() RemoveSchedule(0); } -INT_PTR CScheduler::AddSchedule(Schedule_Struct* schedule) +INT_PTR CScheduler::AddSchedule(Schedule_Struct *schedule) { schedulelist.Add(schedule); - return GetCount()-1; + return GetCount() - 1; } int CScheduler::Check(bool forcecheck) { if (!thePrefs.IsSchedulerEnabled() || theApp.scheduler->GetCount() == 0 - || theApp.emuledlg->IsClosing()) { + || theApp.emuledlg->IsClosing()) + { return -1; } struct tm tmTemp; @@ -126,8 +129,8 @@ int CScheduler::Check(bool forcecheck) theApp.scheduler->RestoreOriginals(); for (int si = 0; si < theApp.scheduler->GetCount(); ++si) { - Schedule_Struct *schedule = theApp.scheduler->GetSchedule(si); - if (schedule->actions[0] == 0 || !schedule->enabled) + const Schedule_Struct *schedule = theApp.scheduler->GetSchedule(si); + if (!schedule->actions[0] || !schedule->enabled) continue; // check day of week @@ -197,11 +200,11 @@ int CScheduler::Check(bool forcecheck) void CScheduler::SaveOriginals() { - original_upload=thePrefs.GetMaxUpload(); - original_download=thePrefs.GetMaxDownload(); - original_connections=thePrefs.GetMaxConnections(); - original_cons5s=thePrefs.GetMaxConperFive(); - original_sources=thePrefs.GetMaxSourcePerFileDefault(); + original_upload = thePrefs.GetMaxUpload(); + original_download = thePrefs.GetMaxDownload(); + original_connections = thePrefs.GetMaxConnections(); + original_cons5s = thePrefs.GetMaxConperFive(); + original_sources = thePrefs.GetMaxSourcePerFileDefault(); } void CScheduler::RestoreOriginals() @@ -213,47 +216,45 @@ void CScheduler::RestoreOriginals() thePrefs.SetMaxSourcesPerFile(original_sources); } -void CScheduler::ActivateSchedule(INT_PTR index,bool makedefault) +void CScheduler::ActivateSchedule(INT_PTR index, bool makedefault) { - Schedule_Struct* schedule = GetSchedule(index); + Schedule_Struct *schedule = GetSchedule(index); - for (int ai=0; ai<16; ++ai) { - if (schedule->actions[ai] == 0) - break; - if (schedule->values[ai].IsEmpty() /* maybe ignore in some future cases...*/ ) + for (int ai = 0; ai < 16 && schedule->actions[ai]; ++ai) { + if (schedule->values[ai].IsEmpty() /* maybe ignore in some future cases...*/) continue; switch (schedule->actions[ai]) { - case 1 : - thePrefs.SetMaxUpload(_tstoi(schedule->values[ai])); - if (makedefault) - original_upload = (uint16)_tstoi(schedule->values[ai]); - break; - case 2 : - thePrefs.SetMaxDownload(_tstoi(schedule->values[ai])); - if (makedefault) - original_download = (uint16)_tstoi(schedule->values[ai]); - break; - case 3 : - thePrefs.SetMaxSourcesPerFile(_tstoi(schedule->values[ai])); - if (makedefault) - original_sources = _tstoi(schedule->values[ai]); - break; - case 4 : - thePrefs.SetMaxConsPerFive(_tstoi(schedule->values[ai])); - if (makedefault) - original_cons5s = _tstoi(schedule->values[ai]); - break; - case 5 : - thePrefs.SetMaxConnections(_tstoi(schedule->values[ai])); - if (makedefault) - original_connections = _tstoi(schedule->values[ai]); - break; - case 6 : - theApp.downloadqueue->SetCatStatus(_tstoi(schedule->values[ai]), MP_STOP); - break; - case 7 : - theApp.downloadqueue->SetCatStatus(_tstoi(schedule->values[ai]), MP_RESUME); + case ACTION_SETUPL: + thePrefs.SetMaxUpload(_tstoi(schedule->values[ai])); + if (makedefault) + original_upload = (uint16)_tstoi(schedule->values[ai]); + break; + case ACTION_SETDOWNL: + thePrefs.SetMaxDownload(_tstoi(schedule->values[ai])); + if (makedefault) + original_download = (uint16)_tstoi(schedule->values[ai]); + break; + case ACTION_SOURCESL: + thePrefs.SetMaxSourcesPerFile(_tstoi(schedule->values[ai])); + if (makedefault) + original_sources = _tstoi(schedule->values[ai]); + break; + case ACTION_CON5SEC: + thePrefs.SetMaxConsPerFive(_tstoi(schedule->values[ai])); + if (makedefault) + original_cons5s = _tstoi(schedule->values[ai]); + break; + case ACTION_CONS: + thePrefs.SetMaxConnections(_tstoi(schedule->values[ai])); + if (makedefault) + original_connections = _tstoi(schedule->values[ai]); + break; + case ACTION_CATSTOP: + theApp.downloadqueue->SetCatStatus(_tstoi(schedule->values[ai]), MP_STOP); + break; + case ACTION_CATRESUME: + theApp.downloadqueue->SetCatStatus(_tstoi(schedule->values[ai]), MP_RESUME); } } } \ No newline at end of file diff --git a/Scheduler.h b/Scheduler.h index 9a0e2798..da5c70df 100644 --- a/Scheduler.h +++ b/Scheduler.h @@ -16,6 +16,7 @@ //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #pragma once +#define ACTION_NONE 0 #define ACTION_SETUPL 1 #define ACTION_SETDOWNL 2 #define ACTION_SOURCESL 3 @@ -36,16 +37,23 @@ #define DAY_MO_SA 9 #define DAY_SA_SO 10 -struct Schedule_Struct{ - CString title; - bool enabled; - UINT day; - time_t time; - time_t time2; - CString values[16]; - int actions[16]; - void ResetActions() {for (uint8 index=0;index<16;++index) {actions[index]=0;values[index].Empty();}} - ~Schedule_Struct() { } +struct Schedule_Struct +{ + time_t time; + time_t time2; + CString title; + CString values[16]; + UINT day; + int actions[16]; + bool enabled; + void ResetActions() + { + for (int i = 16; --i >= 0;) { + actions[i] = 0; + values[i].Empty(); + } + } + ~Schedule_Struct() = default; }; class CScheduler @@ -54,18 +62,18 @@ class CScheduler CScheduler(); ~CScheduler(); - INT_PTR AddSchedule(Schedule_Struct* schedule); - void UpdateSchedule(INT_PTR index, Schedule_Struct* schedule) { if (index schedulelist; + CArray schedulelist; int m_iLastCheckedMinute; }; \ No newline at end of file diff --git a/SplashScreen.cpp b/SplashScreen.cpp index 00e9eecf..80dcb741 100644 --- a/SplashScreen.cpp +++ b/SplashScreen.cpp @@ -137,7 +137,7 @@ void CSplashScreen::OnPaint() _tcscpy(lf.lfFaceName, _T("Arial")); font.CreateFontIndirect(&lf); pOldFont = dc.SelectObject(&font); - dc.DrawText(_T("Copyright (C) 2002-2018 Merkur"), &rc, DT_CENTER | DT_NOPREFIX); + dc.DrawText(_T("Copyright (C) 2002-2019 Merkur"), &rc, DT_CENTER | DT_NOPREFIX); if (pOldFont) dc.SelectObject(pOldFont); font.DeleteObject(); diff --git a/TaskbarNotifier.cpp b/TaskbarNotifier.cpp index 6910e924..07543900 100644 --- a/TaskbarNotifier.cpp +++ b/TaskbarNotifier.cpp @@ -36,12 +36,12 @@ static char THIS_FILE[] = __FILE__; #define IDT_WAITING 2 #define IDT_DISAPPEARING 3 -#define TASKBAR_X_TOLERANCE 10 -#define TASKBAR_Y_TOLERANCE 10 +#define TASKBAR_X_TOLERANCE 5 +#define TASKBAR_Y_TOLERANCE 5 inline bool NearlyEqual(int a, int b, int iEpsilon) { - return abs(a - b) < iEpsilon / 2; + return abs(a - b) < iEpsilon; } // CTaskbarNotifier @@ -70,7 +70,7 @@ CTaskbarNotifier::CTaskbarNotifier() , m_nBitmapWidth() , m_nBitmapHeight() , m_bBitmapAlpha() - , m_uTextFormat(DT_MODIFYSTRING | DT_WORDBREAK | DT_PATH_ELLIPSIS | DT_END_ELLIPSIS | DT_NOPREFIX) + , m_uTextFormat(DT_WORDBREAK | DT_PATH_ELLIPSIS | DT_END_ELLIPSIS | DT_NOPREFIX) , m_bMouseIsOver() , m_bTextSelected() , m_bAutoClose(TRUE) @@ -112,7 +112,7 @@ CTaskbarNotifier::~CTaskbarNotifier() if (m_hMsImg32Dll) FreeLibrary(m_hMsImg32Dll); while (!m_MessageHistory.IsEmpty()) - delete static_cast(m_MessageHistory.RemoveTail()); + delete static_cast(m_MessageHistory.RemoveHead()); } LRESULT CALLBACK My_AfxWndProc(HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam) @@ -199,7 +199,7 @@ BOOL CTaskbarNotifier::LoadConfiguration(LPCTSTR pszFilePath) int iBmpTransparentBlue = ini.GetInt(_T("BmpTrasparentBlue"), 255); iBmpTransparentBlue = ini.GetInt(_T("BmpTransparentBlue"), iBmpTransparentBlue); - CString strFontType = ini.GetString(_T("FontType"), theApp.GetDefaultFontFaceName()); + const CString &strFontType = ini.GetString(_T("FontType"), theApp.GetDefaultFontFaceName()); int iFontSize = ini.GetInt(_T("FontSize"), 8) * 10; m_dwTimeToStay = ini.GetInt(_T("TimeToStay"), 4000); @@ -207,7 +207,7 @@ BOOL CTaskbarNotifier::LoadConfiguration(LPCTSTR pszFilePath) m_dwTimeToHide = ini.GetInt(_T("TimeToHide"), 200); CString strBmpFilePath; - CString strBmpFileName = ini.GetString(_T("BmpFileName"), _T("")); + const CString &strBmpFileName = ini.GetString(_T("BmpFileName"), _T("")); if (!strBmpFileName.IsEmpty()) if (PathIsRelative(strBmpFileName)) strBmpFilePath.Format(_T("%s%s"), szConfigDir, (LPCTSTR)strBmpFileName); @@ -317,17 +317,17 @@ void CTaskbarNotifier::SetTextColor(COLORREF crNormalTextColor, COLORREF crSelec RedrawWindow(&m_rcText); } -void CTaskbarNotifier::SetTextRect(const RECT& rcText) +void CTaskbarNotifier::SetTextRect(const RECT &rcText) { m_rcText = rcText; } -void CTaskbarNotifier::SetCloseBtnRect(const RECT& rcCloseBtn) +void CTaskbarNotifier::SetCloseBtnRect(const RECT &rcCloseBtn) { m_rcCloseBtn = rcCloseBtn; } -void CTaskbarNotifier::SetHistoryBtnRect(const RECT& rcHistoryBtn) +void CTaskbarNotifier::SetHistoryBtnRect(const RECT &rcHistoryBtn) { m_rcHistoryBtn = rcHistoryBtn; } @@ -358,7 +358,7 @@ BOOL CTaskbarNotifier::SetBitmap(UINT nBitmapID, int red, int green, int blue) return (m_nBitmapWidth != 0 && m_nBitmapHeight != 0); } -BOOL CTaskbarNotifier::SetBitmap(CBitmap* pBitmap, int red, int green, int blue) +BOOL CTaskbarNotifier::SetBitmap(CBitmap *pBitmap, int red, int green, int blue) { m_bitmapBackground.DeleteObject(); if (!m_bitmapBackground.Attach(pBitmap->Detach())) @@ -427,12 +427,13 @@ void CTaskbarNotifier::SetAutoClose(BOOL bAutoClose) void CTaskbarNotifier::ShowLastHistoryMessage() { - if (!m_MessageHistory.IsEmpty()) { - CTaskbarNotifierHistory *pHistMsg = static_cast(m_MessageHistory.RemoveHead()); + if (m_MessageHistory.IsEmpty()) + Show(GetResString(IDS_TBN_NOMESSAGEHISTORY), TBN_NULL, NULL); + else { + CTaskbarNotifierHistory *pHistMsg = static_cast(m_MessageHistory.RemoveHead()); Show(pHistMsg->m_strMessage, pHistMsg->m_nMessageType, pHistMsg->m_strLink); delete pHistMsg; - } else - Show(GetResString(IDS_TBN_NOMESSAGEHISTORY), TBN_NULL, NULL); + } } void CTaskbarNotifier::Show(LPCTSTR pszCaption, int nMsgType, LPCTSTR pszLink, BOOL bAutoClose) @@ -445,12 +446,6 @@ void CTaskbarNotifier::Show(LPCTSTR pszCaption, int nMsgType, LPCTSTR pszLink, B return; } - //UINT nScreenHeight; unused - UINT nScreenWidth; - UINT nEvents; - UINT nBitmapSize; - CRect rcTaskbar; - m_strCaption = pszCaption; m_nActiveMessageType = nMsgType; m_strLink = pszLink; @@ -461,7 +456,7 @@ void CTaskbarNotifier::Show(LPCTSTR pszCaption, int nMsgType, LPCTSTR pszLink, B if (nMsgType != TBN_NULL && nMsgType != TBN_LOG && nMsgType != TBN_IMPORTANTEVENT) { // Add element into string list. Max 5 elements. while (m_MessageHistory.GetCount() >= 5) - delete static_cast(m_MessageHistory.RemoveHead()); + delete static_cast(m_MessageHistory.RemoveHead()); CTaskbarNotifierHistory *pHistMsg = new CTaskbarNotifierHistory; pHistMsg->m_strMessage = m_strCaption; pHistMsg->m_nMessageType = nMsgType; @@ -469,13 +464,15 @@ void CTaskbarNotifier::Show(LPCTSTR pszCaption, int nMsgType, LPCTSTR pszLink, B m_MessageHistory.AddTail(pHistMsg); } - nScreenWidth = ::GetSystemMetrics(SM_CXSCREEN); -// nScreenHeight = ::GetSystemMetrics(SM_CYSCREEN); + UINT nScreenWidth = ::GetSystemMetrics(SM_CXSCREEN); + //UINT nScreenHeight = ::GetSystemMetrics(SM_CYSCREEN); HWND hWndTaskbar = ::FindWindow(_T("Shell_TrayWnd"), 0); + CRect rcTaskbar; ::GetWindowRect(hWndTaskbar, &rcTaskbar); // Daniel Lohmann: Calculate taskbar position from its window rect. However, on XP it may be that // the taskbar is slightly larger or smaller than the screen size. Therefore we allow some tolerance here. + DWORD nBitmapSize; if (NearlyEqual(rcTaskbar.left, 0, TASKBAR_X_TOLERANCE) && NearlyEqual(rcTaskbar.right, nScreenWidth, TASKBAR_X_TOLERANCE)) { // Taskbar is on top or on bottom m_nTaskbarPlacement = NearlyEqual(rcTaskbar.top, 0, TASKBAR_Y_TOLERANCE) ? ABE_TOP : ABE_BOTTOM; @@ -490,7 +487,7 @@ void CTaskbarNotifier::Show(LPCTSTR pszCaption, int nMsgType, LPCTSTR pszLink, B // For transparent bitmaps, all animations are disabled. DWORD dwTimeToShow = m_bBitmapAlpha ? 0 : m_dwTimeToShow; if (dwTimeToShow > m_dwTimerPrecision) { - nEvents = max(min((dwTimeToShow / m_dwTimerPrecision) / 2, nBitmapSize), 1); //<<-- enkeyDEV(Ottavio84) -Reduced frames of a half- + UINT nEvents = maxi(mini((dwTimeToShow / m_dwTimerPrecision) / 2u, nBitmapSize), (DWORD)1); //<<-- enkeyDEV(Ottavio84) -Reduced frames of a half- m_dwShowEvents = dwTimeToShow / nEvents; m_nIncrementShow = nBitmapSize / nEvents; } else { @@ -502,7 +499,7 @@ void CTaskbarNotifier::Show(LPCTSTR pszCaption, int nMsgType, LPCTSTR pszLink, B // For transparent bitmaps, all animations are disabled. DWORD dwTimeToHide = m_bBitmapAlpha ? 0 : m_dwTimeToHide; if (dwTimeToHide > m_dwTimerPrecision) { - nEvents = max(min((dwTimeToHide / m_dwTimerPrecision / 2), nBitmapSize), 1); //<<-- enkeyDEV(Ottavio84) -Reduced frames of a half- + UINT nEvents = maxi(mini((dwTimeToHide / m_dwTimerPrecision / 2), nBitmapSize), (DWORD)1); //<<-- enkeyDEV(Ottavio84) -Reduced frames of a half- m_dwHideEvents = dwTimeToHide / nEvents; m_nIncrementHide = nBitmapSize / nEvents; } else { @@ -608,13 +605,13 @@ HRGN CTaskbarNotifier::CreateRgnFromBitmap(HBITMAP hBmp, COLORREF color) if (bm.bmBitsPixel == 32 && m_pfnAlphaBlend) { DWORD dwBitmapBitsSize = GetBitmapBits(hBmp, 0, NULL); if (dwBitmapBitsSize) { - pBitmapBits = (BYTE *)malloc(dwBitmapBitsSize); + pBitmapBits = (BYTE*)malloc(dwBitmapBitsSize); if (pBitmapBits) { if (GetBitmapBits(hBmp, dwBitmapBitsSize, (LPVOID)pBitmapBits) == (LONG)dwBitmapBitsSize) { const BYTE *pLine = pBitmapBits; int iLines = bm.bmHeight; while (!m_bBitmapAlpha && iLines-- > 0) { - const DWORD *pdwPixel = (DWORD *)pLine; + const DWORD *pdwPixel = (DWORD*)pLine; for (int x = 0; x < bm.bmWidth; ++x) { if (*pdwPixel++ & 0xFF000000) { m_bBitmapAlpha = true; @@ -625,7 +622,7 @@ HRGN CTaskbarNotifier::CreateRgnFromBitmap(HBITMAP hBmp, COLORREF color) } } if (!m_bBitmapAlpha) { - free((void *)pBitmapBits); + free((void*)pBitmapBits); pBitmapBits = NULL; } } @@ -640,7 +637,7 @@ HRGN CTaskbarNotifier::CreateRgnFromBitmap(HBITMAP hBmp, COLORREF color) // allocate memory for region data const DWORD MAXBUF = 40; // size of one block in RECTs (i.e. MAXBUF*sizeof(RECT) in bytes) DWORD cBlocks = 0; // number of allocated blocks - RGNDATAHEADER *pRgnData = (RGNDATAHEADER *)calloc(sizeof(RGNDATAHEADER) + ++cBlocks * MAXBUF * sizeof(RECT), 1); + RGNDATAHEADER *pRgnData = (RGNDATAHEADER*)calloc(sizeof(RGNDATAHEADER) + (++cBlocks) * MAXBUF * sizeof(RECT), 1); if (pRgnData) { // fill it by default pRgnData->dwSize = sizeof(RGNDATAHEADER); @@ -650,13 +647,13 @@ HRGN CTaskbarNotifier::CreateRgnFromBitmap(HBITMAP hBmp, COLORREF color) INT iFirstXPos = 0; // left position of current scan line where mask was found bool bWasFirst = false; // set when mask was found in current scan line - const BYTE *pBitmapLine = pBitmapBits != NULL ? pBitmapBits + bm.bmWidthBytes * (bm.bmHeight - 1) : NULL; + const BYTE *pBitmapLine = (pBitmapBits != NULL) ? pBitmapBits + bm.bmWidthBytes * (bm.bmHeight - 1) : NULL; for (int y = 0; pRgnData != NULL && y < bm.bmHeight; ++y) { for (int x = 0; x < bm.bmWidth; ++x) { // get color bool bIsMask; if (pBitmapLine) - bIsMask = ((((const DWORD *)pBitmapLine)[x] & 0xFF000000) != 0x00000000); + bIsMask = ((((DWORD*)pBitmapLine)[x] & 0xFF000000) != 0); else bIsMask = (dcBmp.GetPixel(x, bm.bmHeight - y - 1) != color); @@ -671,7 +668,7 @@ HRGN CTaskbarNotifier::CreateRgnFromBitmap(HBITMAP hBmp, COLORREF color) // if buffer full reallocate it if (pRgnData->nCount >= cBlocks * MAXBUF) { - RGNDATAHEADER *pNewRgnData = (RGNDATAHEADER *)realloc(pRgnData, sizeof(RGNDATAHEADER) + ++cBlocks * MAXBUF * sizeof(RECT)); + RGNDATAHEADER *pNewRgnData = (RGNDATAHEADER*)realloc(pRgnData, sizeof(RGNDATAHEADER) + (++cBlocks) * MAXBUF * sizeof(RECT)); if (pNewRgnData == NULL) { free(pRgnData); pRgnData = NULL; @@ -695,7 +692,7 @@ HRGN CTaskbarNotifier::CreateRgnFromBitmap(HBITMAP hBmp, COLORREF color) hRgn = CreateRectRgn(0, 0, 0, 0); if (hRgn) { LPCRECT pRects = (LPRECT)(pRgnData + 1); - for (DWORD i = 0; i < pRgnData->nCount; i++) { + for (DWORD i = 0; i < pRgnData->nCount; ++i) { HRGN hr = CreateRectRgn(pRects[i].left, pRects[i].top, pRects[i].right, pRects[i].bottom); if (hr) { VERIFY(CombineRgn(hRgn, hRgn, hr, RGN_OR) != ERROR); @@ -710,7 +707,7 @@ HRGN CTaskbarNotifier::CreateRgnFromBitmap(HBITMAP hBmp, COLORREF color) dcBmp.SelectObject(hOldBmp); dcBmp.DeleteDC(); - free((void *)pBitmapBits); + free((void*)pBitmapBits); ReleaseDC(pDC); return hRgn; } @@ -738,7 +735,7 @@ void CTaskbarNotifier::OnLButtonUp(UINT nFlags, CPoint point) { // close button clicked if (m_rcCloseBtn.PtInRect(point)) { - m_bAutoClose = TRUE; // set true so next time arrive an autoclose event the popup will autoclose + m_bAutoClose = TRUE; // set true so next time an autoclose event arrives, the popup will autoclose // (when m_bAutoClose is false a "true" event will be ignored until the user // manually close the windows) switch (m_nAnimStatus) { @@ -756,12 +753,10 @@ void CTaskbarNotifier::OnLButtonUp(UINT nFlags, CPoint point) } // cycle history button clicked - if (m_rcHistoryBtn.PtInRect(point)) { - if (!m_MessageHistory.IsEmpty()) { - CTaskbarNotifierHistory *pHistMsg = static_cast(m_MessageHistory.RemoveHead()); - Show(pHistMsg->m_strMessage, pHistMsg->m_nMessageType, pHistMsg->m_strLink); - delete pHistMsg; - } + if (m_rcHistoryBtn.PtInRect(point) && !m_MessageHistory.IsEmpty()) { + CTaskbarNotifierHistory *pHistMsg = static_cast(m_MessageHistory.RemoveHead()); + Show(pHistMsg->m_strMessage, pHistMsg->m_nMessageType, pHistMsg->m_strLink); + delete pHistMsg; } // message clicked @@ -774,7 +769,7 @@ void CTaskbarNotifier::OnLButtonUp(UINT nFlags, CPoint point) CWnd::OnLButtonUp(nFlags, point); } -LRESULT CTaskbarNotifier::OnMouseHover(WPARAM /*wParam*/, LPARAM lParam) +LRESULT CTaskbarNotifier::OnMouseHover(WPARAM, LPARAM lParam) { if (m_nAnimStatus == IDT_WAITING) KillTimer(IDT_WAITING); @@ -797,7 +792,7 @@ LRESULT CTaskbarNotifier::OnMouseHover(WPARAM /*wParam*/, LPARAM lParam) return 0; } -LRESULT CTaskbarNotifier::OnMouseLeave(WPARAM /*wParam*/, LPARAM /*lParam*/) +LRESULT CTaskbarNotifier::OnMouseLeave(WPARAM, LPARAM) { if (m_bMouseIsOver) { m_bMouseIsOver = FALSE; @@ -844,7 +839,7 @@ void CTaskbarNotifier::OnPaint() } dc.SetBkMode(TRANSPARENT); - dc.DrawText(m_strCaption, m_strCaption.GetLength(), m_rcText, m_uTextFormat); + dc.DrawText(m_strCaption, m_rcText, m_uTextFormat); dc.SelectObject(pOldFont); } @@ -877,14 +872,12 @@ void CTaskbarNotifier::OnTimer(UINT_PTR nIDEvent) } else bKillTimer = true; break; - case ABE_TOP: if (m_nCurrentHeight < m_nBitmapHeight) m_nCurrentHeight += m_nIncrementShow; else bKillTimer = true; break; - case ABE_LEFT: if (m_nCurrentWidth < m_nBitmapWidth) @@ -892,7 +885,6 @@ void CTaskbarNotifier::OnTimer(UINT_PTR nIDEvent) else bKillTimer = true; break; - case ABE_RIGHT: if (m_nCurrentWidth < m_nBitmapWidth) { m_nCurrentPosX -= m_nIncrementShow; @@ -912,7 +904,6 @@ void CTaskbarNotifier::OnTimer(UINT_PTR nIDEvent) if (m_bAutoClose) SetTimer(IDT_DISAPPEARING, m_dwHideEvents, NULL); break; - case IDT_DISAPPEARING: m_nAnimStatus = IDT_DISAPPEARING; switch (m_nTaskbarPlacement) { @@ -923,21 +914,18 @@ void CTaskbarNotifier::OnTimer(UINT_PTR nIDEvent) } else bKillTimer = true; break; - case ABE_TOP: if (m_nCurrentHeight > 0) m_nCurrentHeight -= m_nIncrementHide; else bKillTimer = true; break; - case ABE_LEFT: if (m_nCurrentWidth > 0) m_nCurrentWidth -= m_nIncrementHide; else bKillTimer = true; break; - case ABE_RIGHT: if (m_nCurrentWidth > 0) { m_nCurrentPosX += m_nIncrementHide; diff --git a/TaskbarNotifier.h b/TaskbarNotifier.h index 3d30bd4d..9a4d7d0a 100644 --- a/TaskbarNotifier.h +++ b/TaskbarNotifier.h @@ -9,7 +9,8 @@ #define TN_TEXT_UNDERLINE 0x0004 //START - enkeyDEV(kei-kun) -TaskbarNotifier- -enum TbnMsg { +enum TbnMsg +{ TBN_NONOTIFY, TBN_NULL, TBN_CHAT, @@ -28,12 +29,16 @@ enum TbnMsg { class CTaskbarNotifierHistory : public CObject { public: - CTaskbarNotifierHistory() : m_nMessageType(0) {} - virtual ~CTaskbarNotifierHistory() {} + CTaskbarNotifierHistory() + : m_nMessageType(0) + { + } + + virtual ~CTaskbarNotifierHistory() = default; CString m_strMessage; - int m_nMessageType; CString m_strLink; + int m_nMessageType; }; @@ -55,15 +60,15 @@ class CTaskbarNotifier : public CWnd void Hide(); BOOL SetBitmap(UINT nBitmapID, int red = -1, int green = -1, int blue = -1); - BOOL SetBitmap(LPCTSTR pszFileName,int red = -1, int green = -1, int blue = -1); - BOOL SetBitmap(CBitmap* pBitmap, int red, int green, int blue); + BOOL SetBitmap(LPCTSTR pszFileName, int red = -1, int green = -1, int blue = -1); + BOOL SetBitmap(CBitmap *pBitmap, int red, int green, int blue); void SetTextFont(LPCTSTR pszFont, int nSize, int nNormalStyle, int nSelectedStyle); void SetTextDefaultFont(); void SetTextColor(COLORREF crNormalTextColor, COLORREF crSelectedTextColor); - void SetTextRect(const RECT& rcText); - void SetCloseBtnRect(const RECT& rcCloseBtn); - void SetHistoryBtnRect(const RECT& rcHistoryBtn); + void SetTextRect(const RECT &rcText); + void SetCloseBtnRect(const RECT &rcCloseBtn); + void SetHistoryBtnRect(const RECT &rcHistoryBtn); void SetTextFormat(UINT uTextFormat); void SetAutoClose(BOOL bAutoClose); @@ -106,18 +111,18 @@ class CTaskbarNotifier : public CWnd int m_nIncrementShow; int m_nIncrementHide; int m_nHistoryPosition; //<<--enkeyDEV(kei-kun) -TaskbarNotifier- - int m_nActiveMessageType; //<<--enkeyDEV(kei-kun) -TaskbarNotifier- + int m_nActiveMessageType; //<<--enkeyDEV(kei-kun) -TaskbarNotifier- CObList m_MessageHistory; //<<--enkeyDEV(kei-kun) -TaskbarNotifier- HMODULE m_hMsImg32Dll; - BOOL (WINAPI *m_pfnAlphaBlend)(HDC, int, int, int, int, HDC, int, int, int, int, BLENDFUNCTION); + BOOL(WINAPI *m_pfnAlphaBlend)(HDC, int, int, int, int, HDC, int, int, int, int, BLENDFUNCTION); HRGN CreateRgnFromBitmap(HBITMAP hBmp, COLORREF color); DECLARE_MESSAGE_MAP() afx_msg void OnMouseMove(UINT nFlags, CPoint point); afx_msg void OnLButtonUp(UINT nFlags, CPoint point); - afx_msg LRESULT OnMouseHover(WPARAM wParam, LPARAM lParam); - afx_msg LRESULT OnMouseLeave(WPARAM wParam, LPARAM lParam); + afx_msg LRESULT OnMouseHover(WPARAM, LPARAM lParam); + afx_msg LRESULT OnMouseLeave(WPARAM, LPARAM); afx_msg BOOL OnEraseBkgnd(CDC *pDC); afx_msg void OnPaint(); afx_msg BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message); diff --git a/UDPSocket.cpp b/UDPSocket.cpp index 5f9c605f..6db47c45 100644 --- a/UDPSocket.cpp +++ b/UDPSocket.cpp @@ -706,8 +706,9 @@ SocketSentBytes CUDPSocket::SendControlData(uint32 maxNumberOfBytesToSend, uint3 // <-- ZZ:UploadBandWithThrottler (UDP) while (!controlpacket_queue.IsEmpty() && !IsBusy() && sentBytes < maxNumberOfBytesToSend) { // ZZ:UploadBandWithThrottler (UDP) SServerUDPPacket *packet = controlpacket_queue.RemoveHead(); - if (SendTo(packet->packet, packet->size, packet->dwIP, packet->nPort) >= 0) { - sentBytes += packet->size; // ZZ:UploadBandWithThrottler (UDP) + int len = SendTo(packet->packet, packet->size, packet->dwIP, packet->nPort); + if (len >= 0) { + sentBytes += len; // ZZ:UploadBandWithThrottler (UDP) delete[] packet->packet; delete packet; } else @@ -730,16 +731,16 @@ int CUDPSocket::SendTo(BYTE* lpBuf, int nBufLen, uint32 dwIP, uint16 nPort) //Currently called only locally; sendLocker must be locked by the caller int result = CAsyncSocket::SendTo(lpBuf, nBufLen, nPort, ipstr(dwIP)); if (result == SOCKET_ERROR) { - DWORD dwError = GetLastError(); + DWORD dwError = (DWORD)CAsyncSocket::GetLastError(); if (dwError == WSAEWOULDBLOCK) { m_bWouldBlock = true; - return -1; // blocked + return -1; //blocked } if (thePrefs.GetVerbose()) theApp.QueueDebugLogLine(false, _T("Error: Server UDP socket: Failed to send packet to %s:%u - %s"), (LPCTSTR)ipstr(dwIP), nPort, (LPCTSTR)GetErrorMessage(dwError, 1)); - return 0; // error + return 0; //error } - return result; + return result; //success } void CUDPSocket::SendBuffer(uint32 nIP, uint16 nPort, BYTE* pPacket, UINT uSize) diff --git a/UPnPImplMiniLib.cpp b/UPnPImplMiniLib.cpp index 2707ba52..894074ac 100644 --- a/UPnPImplMiniLib.cpp +++ b/UPnPImplMiniLib.cpp @@ -143,7 +143,7 @@ void CUPnPImplMiniLib::DeletePorts(bool bSkipLock) void CUPnPImplMiniLib::StartDiscovery(uint16 nTCPPort, uint16 nUDPPort, uint16 nTCPWebPort) { DebugLog(_T("Using MiniUPnPLib based implementation")); - DebugLog(_T("miniupnpc (c) 2006-2018 Thomas Bernard - http://miniupnp.free.fr/")); + DebugLog(_T("miniupnpc (c) 2006-2019 Thomas Bernard - http://miniupnp.free.fr/")); GetOldPorts(); m_nUDPPort = nUDPPort; m_nTCPPort = nTCPPort; diff --git a/Version.h b/Version.h index 4733a480..426e03fc 100644 --- a/Version.h +++ b/Version.h @@ -30,8 +30,8 @@ // #define VERSION_MJR 0 #define VERSION_MIN 51 -#define VERSION_UPDATE 1 -#define VERSION_BUILD 3 +#define VERSION_UPDATE 2 +#define VERSION_BUILD 2 // NOTE: Do not forget to update file: res/eMule.manifest diff --git a/WebServer.cpp b/WebServer.cpp index 40049e4b..402360ac 100644 --- a/WebServer.cpp +++ b/WebServer.cpp @@ -1552,10 +1552,8 @@ CString CWebServer::_GetTransferList(const ThreadData& Data) CString strTmp = _ParseURL(Data.sURL, _T("sortreverse")); const CString sSort = _ParseURL(Data.sURL, _T("sort")).MakeLower(); - bool bDirection; - if (!sSort.IsEmpty()) { - bDirection = false; + bool bDirection = false; if (sSort == _T("dstate")) pThis->m_Params.DownloadSort = DOWN_SORT_STATE; else if (sSort == _T("dtype")) @@ -1605,27 +1603,22 @@ CString CWebServer::_GetTransferList(const ThreadData& Data) } else if (sSort == _T("qscore")) pThis->m_Params.QueueSort = QU_SORT_SCORE; - if (strTmp.IsEmpty()) { - if (sSort[0] == _T('d')) - pThis->m_Params.bDownloadSortReverse = bDirection; - else if (sSort[0] == _T('u')) - pThis->m_Params.bUploadSortReverse = bDirection; - else if (sSort[0] == _T('q')) - pThis->m_Params.bQueueSortReverse = bDirection; - } - } - - if (!strTmp.IsEmpty()) { - bDirection = (strTmp.CompareNoCase(_T("true")) == 0); - if (sSort[0] == _T('d')) + if (!strTmp.IsEmpty()) + bDirection = (strTmp.CompareNoCase(_T("true")) == 0); + + switch (sSort[0]) { + case _T('d'): pThis->m_Params.bDownloadSortReverse = bDirection; - else if (sSort[0] == _T('u')) + break; + case _T('u'): pThis->m_Params.bUploadSortReverse = bDirection; - else if (sSort[0] == _T('q')) + break; + case _T('q'): pThis->m_Params.bQueueSortReverse = bDirection; + } } - HTTPTemp = _ParseURL(Data.sURL, _T("showuploadqueue")).MakeLower(); + HTTPTemp = _ParseURL(Data.sURL, _T("showuploadqueue")); if (HTTPTemp == _T("true")) pThis->m_Params.bShowUploadQueue = true; else if (HTTPTemp == _T("false")) diff --git a/emule.vcxproj b/emule.vcxproj index a58307a6..bb88208a 100644 --- a/emule.vcxproj +++ b/emule.vcxproj @@ -60,21 +60,21 @@ true $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ - $(VC_IncludePath);$(UCRTContentRoot)Include\10.0.16299.0\um\;$(UCRTContentRoot)Include\10.0.16299.0\shared\ + $(VC_IncludePath);$(WindowsSDKDir_81)Include\ucrt\;$(WindowsSDKDir_81)Include\um\;$(WindowsSDKDir_81)Include\shared\ *.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b*.asm%3b$(TargetPath) true $(Platform)\Debug\ $(Platform)\Debug\ - $(VC_IncludePath);$(UCRTContentRoot)Include\10.0.16299.0\um\;$(UCRTContentRoot)Include\10.0.16299.0\shared\ + $(VC_IncludePath);$(WindowsSDKDir_81)Include\ucrt\;$(WindowsSDKDir_81)Include\um\;$(WindowsSDKDir_81)Include\shared\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ *.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b*.asm%3b$(TargetPath) false - $(VC_IncludePath);$(UCRTContentRoot)Include\10.0.16299.0\um\;$(UCRTContentRoot)Include\10.0.16299.0\shared\ + $(VC_IncludePath);$(WindowsSDKDir_81)Include\ucrt\;$(WindowsSDKDir_81)Include\um\;$(WindowsSDKDir_81)Include\shared\ @@ -86,7 +86,6 @@ Disabled .;..;id3lib\include;..\mbedtls\include;$(VCToolsInstallDir)atl\include;$(WindowsSdkDir_81)Include\um;$(WindowsSdkDir_81)Include\shared; ID3LIB_LINKOPTION=1;MINIUPNP_STATICLIB;SUPPORT_LARGE_FILES;_DEBUG;XP_BUILD;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug true @@ -96,7 +95,7 @@ _UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) + $(IntDir);$(WindowsSDKDir_81)Include\ucrt\;$(WindowsSDKDir_81)Include\um\;$(WindowsSDKDir_81)Include\shared\;$(VC_IncludePath);%(AdditionalIncludeDirectories) ADSIId.lib;crypt32.lib;iphlpapi.lib;version.lib;winmm.lib;ws2_32.lib;..\cryptopp\$(Platform)\$(Configuration)\cryptlib.lib;cximage\$(Platform)\$(Configuration)\cximage.lib;id3lib\libprj\$(Platform)\$(Configuration)\id3lib.lib;..\libpng\projects\visualc\$(Platform)\$(Configuration)\libpng.lib;..\mbedtls\visualc\vs2010\$(Platform)\$(Configuration)\mbedtls.lib;..\miniupnpc\msvc\$(Platform)\$(Configuration)\miniupnpc.lib;..\resizablelib\$(Platform)\$(Configuration)\resizablelib.lib;..\zlib\contrib\vstudio\vc\$(Platform)\$(Configuration)\zlib.lib;%(AdditionalDependencies) @@ -126,7 +125,6 @@ Disabled .;..;id3lib\include;..\mbedtls\include;$(VCToolsInstallDir)atl\include;$(WindowsSdkDir_81)Include\um;$(WindowsSdkDir_81)Include\shared;$(WindowsSdkDir_81)Include\winnt; ID3LIB_LINKOPTION=1;MINIUPNP_STATICLIB;SUPPORT_LARGE_FILES;_DEBUG;_BOOTSTRAPNODESDAT;XP_BUILD;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug true @@ -135,7 +133,7 @@ _UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) + $(IntDir);$(WindowsSDKDir_81)Include\um\;%(AdditionalIncludeDirectories) ADSIId.lib;crypt32.lib;iphlpapi.lib;version.lib;winmm.lib;ws2_32.lib;..\cryptopp\$(Platform)\Debug\cryptlib.lib;cximage\$(Platform)\Debug\cximage.lib;id3lib\libprj\$(Platform)\Debug\id3lib.lib;..\libpng\projects\visualc\$(Platform)\Debug\libpng.lib;..\mbedtls\visualc\vs2010\$(Platform)\Debug\mbedtls.lib;..\miniupnpc\msvc\$(Platform)\Debug\miniupnpc.lib;..\resizablelib\$(Platform)\Debug\resizablelib.lib;..\zlib\contrib\vstudio\vc\$(Platform)\Debug\zlib.lib;%(AdditionalDependencies) @@ -169,7 +167,7 @@ _UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) + $(IntDir);$(WindowsSDKDir_81)Include\um\;%(AdditionalIncludeDirectories) /safeseh diff --git a/emule_site_config.h b/emule_site_config.h index 59bcf961..178a9bff 100644 --- a/emule_site_config.h +++ b/emule_site_config.h @@ -11,6 +11,7 @@ #ifdef XP_BUILD #define _WIN32_WINNT _WIN32_WINNT_WINXP +#define NTDDI_VERSION NTDDI_WINXP #endif ////////////////////////////////////////////////////////////////////////////// diff --git a/kademlia/kademlia/Entry.cpp b/kademlia/kademlia/Entry.cpp index 2d56130f..29b07a85 100644 --- a/kademlia/kademlia/Entry.cpp +++ b/kademlia/kademlia/Entry.cpp @@ -161,7 +161,7 @@ CKadTagValueString CEntry::GetCommonFileNameLowerCase() const uint32 CEntry::GetTagCount() const // Adds filename and size to the count if not empty, even if they are not stored as tags { - return (uint32)(m_listTag.size() + static_cast(m_uSize != 0) + static_cast(GetCommonFileName().IsEmpty())); + return (uint32)(m_listTag.size() + static_cast(m_uSize > 0) + static_cast(!GetCommonFileName().IsEmpty())); } void CEntry::WriteTagListInc(CDataIO* pData, uint32 nIncreaseTagNumber) diff --git a/lang/ar_AE.vcxproj b/lang/ar_AE.vcxproj index ad59736f..1aef11bc 100644 --- a/lang/ar_AE.vcxproj +++ b/lang/ar_AE.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Arabic (UAE) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)ar_AE.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/ba_BA.vcxproj b/lang/ba_BA.vcxproj index 4716a418..cc2c7100 100644 --- a/lang/ba_BA.vcxproj +++ b/lang/ba_BA.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Basque @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)ba_BA.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/bg_BG.vcxproj b/lang/bg_BG.vcxproj index 4e81edf5..3229c3d5 100644 --- a/lang/bg_BG.vcxproj +++ b/lang/bg_BG.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Bulgarian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)bg_BG.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/ca_ES.vcxproj b/lang/ca_ES.vcxproj index efc178c7..568f57e9 100644 --- a/lang/ca_ES.vcxproj +++ b/lang/ca_ES.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Catalan @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)ca_ES.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/cz_CZ.vcxproj b/lang/cz_CZ.vcxproj index 817c1ecd..024b5b0b 100644 --- a/lang/cz_CZ.vcxproj +++ b/lang/cz_CZ.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Czech @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)cz_CZ.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/da_DK.vcxproj b/lang/da_DK.vcxproj index 60de6bf5..d2ee8720 100644 --- a/lang/da_DK.vcxproj +++ b/lang/da_DK.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Danish @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)da_DK.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/de_DE.vcxproj b/lang/de_DE.vcxproj index e9c6a21f..bf79fdaf 100644 --- a/lang/de_DE.vcxproj +++ b/lang/de_DE.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - German (Germany) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)de_DE.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/el_GR.vcxproj b/lang/el_GR.vcxproj index 52067057..a4369c23 100644 --- a/lang/el_GR.vcxproj +++ b/lang/el_GR.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Greek @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)el_GR.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/emule.rc b/lang/emule.rc index 6c09fee8..57931694 100644 --- a/lang/emule.rc +++ b/lang/emule.rc @@ -162,7 +162,7 @@ BEGIN IDS_SE "Source Exchange" IDS_ERR_WRITEERROR "Unexpected file error while writing %s : %s" IDS_ERR_COMPLETIONFAILED - "Unexpected file error while completing ""%s"". File paused, restart eMule for another try to complete" + "Unexpected file error while completing ""%s"". File paused, restart eMule to try again to complete" IDS_ERR_DELETEFAILED "Failed to delete %s, you will need to do this by hand" IDS_DOWNLOADDONE "Finished downloading %s :-)" IDS_ERR_DELETE "Failed to delete %s" diff --git a/lang/es_AS.vcxproj b/lang/es_AS.vcxproj index 54eadeb2..7e0a0f73 100644 --- a/lang/es_AS.vcxproj +++ b/lang/es_AS.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Asturian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)es_AS.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/es_ES_T.vcxproj b/lang/es_ES_T.vcxproj index d24dcf8c..666d117f 100644 --- a/lang/es_ES_T.vcxproj +++ b/lang/es_ES_T.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Spanish (Castilian) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)es_ES_T.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/et_EE.vcxproj b/lang/et_EE.vcxproj index e1fcc782..dfc9e6c0 100644 --- a/lang/et_EE.vcxproj +++ b/lang/et_EE.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Estonian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)et_EE.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/fa_IR.vcxproj b/lang/fa_IR.vcxproj index 5740896e..18504790 100644 --- a/lang/fa_IR.vcxproj +++ b/lang/fa_IR.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Farsi @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)fa_IR.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/fi_FI.vcxproj b/lang/fi_FI.vcxproj index 22e23411..a2124285 100644 --- a/lang/fi_FI.vcxproj +++ b/lang/fi_FI.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Finnish @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)fi_FI.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/fr_BR.vcxproj b/lang/fr_BR.vcxproj index f9ef1787..09d9e76f 100644 --- a/lang/fr_BR.vcxproj +++ b/lang/fr_BR.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - French (Breton) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\Debug\lang md ..\Debug\lang copy "$(TargetPath)" ..\Debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)fr_BR.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\Debug\lang md ..\Debug\lang -copy "$(TargetPath)" ..\Debug\lang\$(TargetFileName) diff --git a/lang/fr_FR.vcxproj b/lang/fr_FR.vcxproj index 9db9898f..82b28c00 100644 --- a/lang/fr_FR.vcxproj +++ b/lang/fr_FR.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - French (France) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)fr_FR.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/gl_ES.vcxproj b/lang/gl_ES.vcxproj index 25b15b1e..4a41933d 100644 --- a/lang/gl_ES.vcxproj +++ b/lang/gl_ES.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Galician @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)gl_ES.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/he_IL.vcxproj b/lang/he_IL.vcxproj index 8c6a0558..04c8c108 100644 --- a/lang/he_IL.vcxproj +++ b/lang/he_IL.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Hebrew (Israel) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)he_IL.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/hu_HU.vcxproj b/lang/hu_HU.vcxproj index a41fa882..1257c52e 100644 --- a/lang/hu_HU.vcxproj +++ b/lang/hu_HU.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Hungarian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)hu_HU.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/it_IT.vcxproj b/lang/it_IT.vcxproj index 1f543c5d..08cad9f1 100644 --- a/lang/it_IT.vcxproj +++ b/lang/it_IT.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Italian (Italy) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)it_IT.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/jp_JP.vcxproj b/lang/jp_JP.vcxproj index 53c86ede..c121487a 100644 --- a/lang/jp_JP.vcxproj +++ b/lang/jp_JP.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Japanese @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)jp_JP.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/ko_KR.vcxproj b/lang/ko_KR.vcxproj index 0738838d..7486d9bc 100644 --- a/lang/ko_KR.vcxproj +++ b/lang/ko_KR.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Korean @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)ko_KR.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/lang.sln b/lang/lang.sln index 34c4f733..fdd195df 100644 --- a/lang/lang.sln +++ b/lang/lang.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.421 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "languages - Arabic (UAE)", "ar_AE.vcxproj", "{A710033C-F75A-4431-96AA-876A9867A2F8}" EndProject @@ -90,186 +90,102 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "languages - Valencian (RACV EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Dynamic|x64 = Dynamic|x64 Dynamic|x86 = Dynamic|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A710033C-F75A-4431-96AA-876A9867A2F8}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {A710033C-F75A-4431-96AA-876A9867A2F8}.Dynamic|x64.Build.0 = Dynamic|x64 {A710033C-F75A-4431-96AA-876A9867A2F8}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {A710033C-F75A-4431-96AA-876A9867A2F8}.Dynamic|x86.Build.0 = Dynamic|Win32 - {44716561-6BA7-40DA-AE7F-F3FFB422E86D}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {44716561-6BA7-40DA-AE7F-F3FFB422E86D}.Dynamic|x64.Build.0 = Dynamic|x64 {44716561-6BA7-40DA-AE7F-F3FFB422E86D}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {44716561-6BA7-40DA-AE7F-F3FFB422E86D}.Dynamic|x86.Build.0 = Dynamic|Win32 - {0C96EF73-186D-4888-BB53-EECE60B55647}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {0C96EF73-186D-4888-BB53-EECE60B55647}.Dynamic|x64.Build.0 = Dynamic|x64 {0C96EF73-186D-4888-BB53-EECE60B55647}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {0C96EF73-186D-4888-BB53-EECE60B55647}.Dynamic|x86.Build.0 = Dynamic|Win32 - {0C42D310-84EB-462F-944B-7166C0D071E9}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {0C42D310-84EB-462F-944B-7166C0D071E9}.Dynamic|x64.Build.0 = Dynamic|x64 {0C42D310-84EB-462F-944B-7166C0D071E9}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {0C42D310-84EB-462F-944B-7166C0D071E9}.Dynamic|x86.Build.0 = Dynamic|Win32 - {8104E8D8-7343-4BE7-8955-80A1F2D26EC1}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {8104E8D8-7343-4BE7-8955-80A1F2D26EC1}.Dynamic|x64.Build.0 = Dynamic|x64 {8104E8D8-7343-4BE7-8955-80A1F2D26EC1}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {8104E8D8-7343-4BE7-8955-80A1F2D26EC1}.Dynamic|x86.Build.0 = Dynamic|Win32 - {8DA8A9E2-9987-4B68-9825-45C445C52730}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {8DA8A9E2-9987-4B68-9825-45C445C52730}.Dynamic|x64.Build.0 = Dynamic|x64 {8DA8A9E2-9987-4B68-9825-45C445C52730}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {8DA8A9E2-9987-4B68-9825-45C445C52730}.Dynamic|x86.Build.0 = Dynamic|Win32 - {B0DAEE35-FD0F-4FAF-A7C1-3D52103B3E81}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {B0DAEE35-FD0F-4FAF-A7C1-3D52103B3E81}.Dynamic|x64.Build.0 = Dynamic|x64 {B0DAEE35-FD0F-4FAF-A7C1-3D52103B3E81}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {B0DAEE35-FD0F-4FAF-A7C1-3D52103B3E81}.Dynamic|x86.Build.0 = Dynamic|Win32 - {14AB1B79-6F57-43EB-A5EA-B9B117B659B4}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {14AB1B79-6F57-43EB-A5EA-B9B117B659B4}.Dynamic|x64.Build.0 = Dynamic|x64 {14AB1B79-6F57-43EB-A5EA-B9B117B659B4}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {14AB1B79-6F57-43EB-A5EA-B9B117B659B4}.Dynamic|x86.Build.0 = Dynamic|Win32 - {745D6455-7389-4C76-8275-D91F7451E0FA}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {745D6455-7389-4C76-8275-D91F7451E0FA}.Dynamic|x64.Build.0 = Dynamic|x64 {745D6455-7389-4C76-8275-D91F7451E0FA}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {745D6455-7389-4C76-8275-D91F7451E0FA}.Dynamic|x86.Build.0 = Dynamic|Win32 - {A7E4E792-AA76-4977-A725-1C428AADE381}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {A7E4E792-AA76-4977-A725-1C428AADE381}.Dynamic|x64.Build.0 = Dynamic|x64 {A7E4E792-AA76-4977-A725-1C428AADE381}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {A7E4E792-AA76-4977-A725-1C428AADE381}.Dynamic|x86.Build.0 = Dynamic|Win32 - {3C9B64A2-6676-4A60-A805-15301A18C550}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {3C9B64A2-6676-4A60-A805-15301A18C550}.Dynamic|x64.Build.0 = Dynamic|x64 {3C9B64A2-6676-4A60-A805-15301A18C550}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {3C9B64A2-6676-4A60-A805-15301A18C550}.Dynamic|x86.Build.0 = Dynamic|Win32 - {FEF2FD72-388B-42F6-B5DA-B9A663ACF557}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {FEF2FD72-388B-42F6-B5DA-B9A663ACF557}.Dynamic|x64.Build.0 = Dynamic|x64 {FEF2FD72-388B-42F6-B5DA-B9A663ACF557}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {FEF2FD72-388B-42F6-B5DA-B9A663ACF557}.Dynamic|x86.Build.0 = Dynamic|Win32 - {AA2EA361-4793-4FF7-A042-40E271030CC4}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {AA2EA361-4793-4FF7-A042-40E271030CC4}.Dynamic|x64.Build.0 = Dynamic|x64 {AA2EA361-4793-4FF7-A042-40E271030CC4}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {AA2EA361-4793-4FF7-A042-40E271030CC4}.Dynamic|x86.Build.0 = Dynamic|Win32 - {9B6F843F-A792-466D-98E3-A3921525AFF5}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {9B6F843F-A792-466D-98E3-A3921525AFF5}.Dynamic|x64.Build.0 = Dynamic|x64 {9B6F843F-A792-466D-98E3-A3921525AFF5}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {9B6F843F-A792-466D-98E3-A3921525AFF5}.Dynamic|x86.Build.0 = Dynamic|Win32 - {2885B86D-9DDA-460C-9FB8-41B005F15349}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {2885B86D-9DDA-460C-9FB8-41B005F15349}.Dynamic|x64.Build.0 = Dynamic|x64 {2885B86D-9DDA-460C-9FB8-41B005F15349}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {2885B86D-9DDA-460C-9FB8-41B005F15349}.Dynamic|x86.Build.0 = Dynamic|Win32 - {DE470764-A818-4780-B590-78EB8D560E89}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {DE470764-A818-4780-B590-78EB8D560E89}.Dynamic|x64.Build.0 = Dynamic|x64 {DE470764-A818-4780-B590-78EB8D560E89}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {DE470764-A818-4780-B590-78EB8D560E89}.Dynamic|x86.Build.0 = Dynamic|Win32 - {A989B752-28A2-44E7-8C19-F49C7ECD61DC}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {A989B752-28A2-44E7-8C19-F49C7ECD61DC}.Dynamic|x64.Build.0 = Dynamic|x64 {A989B752-28A2-44E7-8C19-F49C7ECD61DC}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {A989B752-28A2-44E7-8C19-F49C7ECD61DC}.Dynamic|x86.Build.0 = Dynamic|Win32 - {57E9C9FF-E57F-46E0-823A-38DD76FEEBC6}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {57E9C9FF-E57F-46E0-823A-38DD76FEEBC6}.Dynamic|x64.Build.0 = Dynamic|x64 {57E9C9FF-E57F-46E0-823A-38DD76FEEBC6}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {57E9C9FF-E57F-46E0-823A-38DD76FEEBC6}.Dynamic|x86.Build.0 = Dynamic|Win32 - {C7F4CB73-7D57-4077-9C04-931A6CB0677D}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {C7F4CB73-7D57-4077-9C04-931A6CB0677D}.Dynamic|x64.Build.0 = Dynamic|x64 {C7F4CB73-7D57-4077-9C04-931A6CB0677D}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {C7F4CB73-7D57-4077-9C04-931A6CB0677D}.Dynamic|x86.Build.0 = Dynamic|Win32 - {64DFFE85-14E0-41D7-ADFA-7D53EE81D1B2}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {64DFFE85-14E0-41D7-ADFA-7D53EE81D1B2}.Dynamic|x64.Build.0 = Dynamic|x64 {64DFFE85-14E0-41D7-ADFA-7D53EE81D1B2}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {64DFFE85-14E0-41D7-ADFA-7D53EE81D1B2}.Dynamic|x86.Build.0 = Dynamic|Win32 - {4AE4AB3A-FD80-4DFE-BF9B-AC845DCF2449}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {4AE4AB3A-FD80-4DFE-BF9B-AC845DCF2449}.Dynamic|x64.Build.0 = Dynamic|x64 {4AE4AB3A-FD80-4DFE-BF9B-AC845DCF2449}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {4AE4AB3A-FD80-4DFE-BF9B-AC845DCF2449}.Dynamic|x86.Build.0 = Dynamic|Win32 - {F8A9B7BC-3CBB-4DEC-A04E-5224A65A6632}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {F8A9B7BC-3CBB-4DEC-A04E-5224A65A6632}.Dynamic|x64.Build.0 = Dynamic|x64 {F8A9B7BC-3CBB-4DEC-A04E-5224A65A6632}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {F8A9B7BC-3CBB-4DEC-A04E-5224A65A6632}.Dynamic|x86.Build.0 = Dynamic|Win32 - {2AECAA37-18C5-4C04-8E34-3E6EDCD926AE}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {2AECAA37-18C5-4C04-8E34-3E6EDCD926AE}.Dynamic|x64.Build.0 = Dynamic|x64 {2AECAA37-18C5-4C04-8E34-3E6EDCD926AE}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {2AECAA37-18C5-4C04-8E34-3E6EDCD926AE}.Dynamic|x86.Build.0 = Dynamic|Win32 - {EFE9605D-BF5C-4339-9A5A-32184D4BD03C}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {EFE9605D-BF5C-4339-9A5A-32184D4BD03C}.Dynamic|x64.Build.0 = Dynamic|x64 {EFE9605D-BF5C-4339-9A5A-32184D4BD03C}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {EFE9605D-BF5C-4339-9A5A-32184D4BD03C}.Dynamic|x86.Build.0 = Dynamic|Win32 - {BFCEE1BE-5DC9-4CDF-B55E-6DEDFC4FF782}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {BFCEE1BE-5DC9-4CDF-B55E-6DEDFC4FF782}.Dynamic|x64.Build.0 = Dynamic|x64 {BFCEE1BE-5DC9-4CDF-B55E-6DEDFC4FF782}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {BFCEE1BE-5DC9-4CDF-B55E-6DEDFC4FF782}.Dynamic|x86.Build.0 = Dynamic|Win32 - {DB748474-ADA6-4AEB-8694-F02088D88AD7}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {DB748474-ADA6-4AEB-8694-F02088D88AD7}.Dynamic|x64.Build.0 = Dynamic|x64 {DB748474-ADA6-4AEB-8694-F02088D88AD7}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {DB748474-ADA6-4AEB-8694-F02088D88AD7}.Dynamic|x86.Build.0 = Dynamic|Win32 - {583840C9-525A-4417-866C-6197EBC12214}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {583840C9-525A-4417-866C-6197EBC12214}.Dynamic|x64.Build.0 = Dynamic|x64 {583840C9-525A-4417-866C-6197EBC12214}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {583840C9-525A-4417-866C-6197EBC12214}.Dynamic|x86.Build.0 = Dynamic|Win32 - {6191AA5F-75C1-4448-9CE1-E5DED284501B}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {6191AA5F-75C1-4448-9CE1-E5DED284501B}.Dynamic|x64.Build.0 = Dynamic|x64 {6191AA5F-75C1-4448-9CE1-E5DED284501B}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {6191AA5F-75C1-4448-9CE1-E5DED284501B}.Dynamic|x86.Build.0 = Dynamic|Win32 - {76FA1CA3-FC3D-45D2-86A8-B068F551652F}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {76FA1CA3-FC3D-45D2-86A8-B068F551652F}.Dynamic|x64.Build.0 = Dynamic|x64 {76FA1CA3-FC3D-45D2-86A8-B068F551652F}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {76FA1CA3-FC3D-45D2-86A8-B068F551652F}.Dynamic|x86.Build.0 = Dynamic|Win32 - {E5EF62C7-377D-4B61-8244-CC4F8555F733}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {E5EF62C7-377D-4B61-8244-CC4F8555F733}.Dynamic|x64.Build.0 = Dynamic|x64 {E5EF62C7-377D-4B61-8244-CC4F8555F733}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {E5EF62C7-377D-4B61-8244-CC4F8555F733}.Dynamic|x86.Build.0 = Dynamic|Win32 - {3DCA40EE-0C42-4D51-996F-EF2D3E599738}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {3DCA40EE-0C42-4D51-996F-EF2D3E599738}.Dynamic|x64.Build.0 = Dynamic|x64 {3DCA40EE-0C42-4D51-996F-EF2D3E599738}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {3DCA40EE-0C42-4D51-996F-EF2D3E599738}.Dynamic|x86.Build.0 = Dynamic|Win32 - {5E420537-E1A9-4004-BBDC-F2853AAD5485}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {5E420537-E1A9-4004-BBDC-F2853AAD5485}.Dynamic|x64.Build.0 = Dynamic|x64 {5E420537-E1A9-4004-BBDC-F2853AAD5485}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {5E420537-E1A9-4004-BBDC-F2853AAD5485}.Dynamic|x86.Build.0 = Dynamic|Win32 - {EAEEB94B-AA03-4E8D-8135-D02D22FBD422}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {EAEEB94B-AA03-4E8D-8135-D02D22FBD422}.Dynamic|x64.Build.0 = Dynamic|x64 {EAEEB94B-AA03-4E8D-8135-D02D22FBD422}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {EAEEB94B-AA03-4E8D-8135-D02D22FBD422}.Dynamic|x86.Build.0 = Dynamic|Win32 - {67E3DA3B-6DA6-4948-BA97-3C2519F4DCC6}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {67E3DA3B-6DA6-4948-BA97-3C2519F4DCC6}.Dynamic|x64.Build.0 = Dynamic|x64 {67E3DA3B-6DA6-4948-BA97-3C2519F4DCC6}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {67E3DA3B-6DA6-4948-BA97-3C2519F4DCC6}.Dynamic|x86.Build.0 = Dynamic|Win32 - {8104E8D8-7343-4BE7-8955-80A1F2D26EC2}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {8104E8D8-7343-4BE7-8955-80A1F2D26EC2}.Dynamic|x64.Build.0 = Dynamic|x64 {8104E8D8-7343-4BE7-8955-80A1F2D26EC2}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {8104E8D8-7343-4BE7-8955-80A1F2D26EC2}.Dynamic|x86.Build.0 = Dynamic|Win32 - {7DB64944-4784-4F40-9F87-98B8BC623854}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {7DB64944-4784-4F40-9F87-98B8BC623854}.Dynamic|x64.Build.0 = Dynamic|x64 {7DB64944-4784-4F40-9F87-98B8BC623854}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {7DB64944-4784-4F40-9F87-98B8BC623854}.Dynamic|x86.Build.0 = Dynamic|Win32 - {D0CFB304-1B97-4C5E-AF66-35A223DDB14B}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {D0CFB304-1B97-4C5E-AF66-35A223DDB14B}.Dynamic|x64.Build.0 = Dynamic|x64 {D0CFB304-1B97-4C5E-AF66-35A223DDB14B}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {D0CFB304-1B97-4C5E-AF66-35A223DDB14B}.Dynamic|x86.Build.0 = Dynamic|Win32 - {E32658C1-CD24-40DC-8912-C7D3FE803FC1}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {E32658C1-CD24-40DC-8912-C7D3FE803FC1}.Dynamic|x64.Build.0 = Dynamic|x64 {E32658C1-CD24-40DC-8912-C7D3FE803FC1}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {E32658C1-CD24-40DC-8912-C7D3FE803FC1}.Dynamic|x86.Build.0 = Dynamic|Win32 - {2A1AEDDB-5ED3-4CA7-8E2D-B0178131397F}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {2A1AEDDB-5ED3-4CA7-8E2D-B0178131397F}.Dynamic|x64.Build.0 = Dynamic|x64 {2A1AEDDB-5ED3-4CA7-8E2D-B0178131397F}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {2A1AEDDB-5ED3-4CA7-8E2D-B0178131397F}.Dynamic|x86.Build.0 = Dynamic|Win32 - {631B7B35-DF4B-480A-A61E-F6693403FE5E}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {631B7B35-DF4B-480A-A61E-F6693403FE5E}.Dynamic|x64.Build.0 = Dynamic|x64 {631B7B35-DF4B-480A-A61E-F6693403FE5E}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {631B7B35-DF4B-480A-A61E-F6693403FE5E}.Dynamic|x86.Build.0 = Dynamic|Win32 - {F2ED1274-6DA7-4F08-B9C8-1915409EAEC1}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {F2ED1274-6DA7-4F08-B9C8-1915409EAEC1}.Dynamic|x64.Build.0 = Dynamic|x64 {F2ED1274-6DA7-4F08-B9C8-1915409EAEC1}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {F2ED1274-6DA7-4F08-B9C8-1915409EAEC1}.Dynamic|x86.Build.0 = Dynamic|Win32 - {246A71D1-8AD2-46A1-B04D-8EEF78036F27}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {246A71D1-8AD2-46A1-B04D-8EEF78036F27}.Dynamic|x64.Build.0 = Dynamic|x64 {246A71D1-8AD2-46A1-B04D-8EEF78036F27}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {246A71D1-8AD2-46A1-B04D-8EEF78036F27}.Dynamic|x86.Build.0 = Dynamic|Win32 - {506A62DC-BB66-4686-BCBE-E1BBB0B1E27A}.Dynamic|x64.ActiveCfg = Dynamic|x64 - {506A62DC-BB66-4686-BCBE-E1BBB0B1E27A}.Dynamic|x64.Build.0 = Dynamic|x64 {506A62DC-BB66-4686-BCBE-E1BBB0B1E27A}.Dynamic|x86.ActiveCfg = Dynamic|Win32 {506A62DC-BB66-4686-BCBE-E1BBB0B1E27A}.Dynamic|x86.Build.0 = Dynamic|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {EF2FC26A-0977-4D16-A08B-18E74D3D19CF} + EndGlobalSection GlobalSection(DevPartner) = postSolution EndGlobalSection GlobalSection(DevPartner) = postSolution diff --git a/lang/lt_LT.vcxproj b/lang/lt_LT.vcxproj index 615542b5..71253b5e 100644 --- a/lang/lt_LT.vcxproj +++ b/lang/lt_LT.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Lithuanian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)lt_LT.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/lv_LV.vcxproj b/lang/lv_LV.vcxproj index 74d388eb..c0dc0ed6 100644 --- a/lang/lv_LV.vcxproj +++ b/lang/lv_LV.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Latvian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)lv_LV.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/mt_MT.vcxproj b/lang/mt_MT.vcxproj index db3fd403..4b35652b 100644 --- a/lang/mt_MT.vcxproj +++ b/lang/mt_MT.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Maltese @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)mt_MT.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/nb_NO.vcxproj b/lang/nb_NO.vcxproj index 692ff1f6..a743d52e 100644 --- a/lang/nb_NO.vcxproj +++ b/lang/nb_NO.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Norwegian (Bokmal) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)nb_NO.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/nl_NL.vcxproj b/lang/nl_NL.vcxproj index 4c609a02..0a4c0923 100644 --- a/lang/nl_NL.vcxproj +++ b/lang/nl_NL.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Dutch (Netherlands) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)nl_NL.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/nn_NO.vcxproj b/lang/nn_NO.vcxproj index 0d5acaaa..2761b1e8 100644 --- a/lang/nn_NO.vcxproj +++ b/lang/nn_NO.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Norwegian (Nynorsk) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)nn_NO.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/pl_PL.vcxproj b/lang/pl_PL.vcxproj index 004ed84c..23e0a1c0 100644 --- a/lang/pl_PL.vcxproj +++ b/lang/pl_PL.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Polish @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)pl_PL.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/pt_BR.vcxproj b/lang/pt_BR.vcxproj index 6349b307..61c9db38 100644 --- a/lang/pt_BR.vcxproj +++ b/lang/pt_BR.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Portuguese (Brazil) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)pt_BR.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/pt_PT.vcxproj b/lang/pt_PT.vcxproj index 17b76780..4f3d377c 100644 --- a/lang/pt_PT.vcxproj +++ b/lang/pt_PT.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Portuguese (Portugal) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)pt_PT.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/ro_RO.vcxproj b/lang/ro_RO.vcxproj index d418614d..16bec6ff 100644 --- a/lang/ro_RO.vcxproj +++ b/lang/ro_RO.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Romania @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\Debug\lang md ..\Debug\lang copy "$(TargetPath)" ..\Debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)ro_RO.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\Debug\lang md ..\Debug\lang -copy "$(TargetPath)" ..\Debug\lang\$(TargetFileName) diff --git a/lang/ru_RU.vcxproj b/lang/ru_RU.vcxproj index c8088078..332400e6 100644 --- a/lang/ru_RU.vcxproj +++ b/lang/ru_RU.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Russian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)ru_RU.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/sl_SI.vcxproj b/lang/sl_SI.vcxproj index 4fcc0dc4..f61295e9 100644 --- a/lang/sl_SI.vcxproj +++ b/lang/sl_SI.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Slovenian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)sl_SI.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/sq_AL.vcxproj b/lang/sq_AL.vcxproj index 131f8750..a8660a14 100644 --- a/lang/sq_AL.vcxproj +++ b/lang/sq_AL.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Albanian (Albania) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)sq_AL.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/sv_SE.vcxproj b/lang/sv_SE.vcxproj index 7c8feedf..9dbd6aa6 100644 --- a/lang/sv_SE.vcxproj +++ b/lang/sv_SE.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Swedish @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)sv_SE.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/tr_TR.vcxproj b/lang/tr_TR.vcxproj index 1a73b2a0..ce81b8c8 100644 --- a/lang/tr_TR.vcxproj +++ b/lang/tr_TR.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Turkish @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)tr_TR.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/ua_UA.vcxproj b/lang/ua_UA.vcxproj index 85c0364f..4aff73ca 100644 --- a/lang/ua_UA.vcxproj +++ b/lang/ua_UA.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Ukrainian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)ua_UA.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/ug_CN.vcxproj b/lang/ug_CN.vcxproj index 30ea6dbe..b24e4004 100644 --- a/lang/ug_CN.vcxproj +++ b/lang/ug_CN.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Uighur (PRC) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)ug_CN.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/va_ES.vcxproj b/lang/va_ES.vcxproj index 830d83f3..44ee8bd5 100644 --- a/lang/va_ES.vcxproj +++ b/lang/va_ES.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Valencian @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)va_ES.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/va_ES_RACV.vcxproj b/lang/va_ES_RACV.vcxproj index 76c14229..6b9769ec 100644 --- a/lang/va_ES_RACV.vcxproj +++ b/lang/va_ES_RACV.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Valencian (RACV) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)va_ES_RACV.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/vi_VN.vcxproj b/lang/vi_VN.vcxproj index e5e952d2..58b5e634 100644 --- a/lang/vi_VN.vcxproj +++ b/lang/vi_VN.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Vietnamese @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)vi_VN.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/zh_CN.vcxproj b/lang/zh_CN.vcxproj index 60a4d378..e01dd9d4 100644 --- a/lang/zh_CN.vcxproj +++ b/lang/zh_CN.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Chinese (P.R.C.) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)zh_CN.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/lang/zh_TW.vcxproj b/lang/zh_TW.vcxproj index 469727a2..94bd46fb 100644 --- a/lang/zh_TW.vcxproj +++ b/lang/zh_TW.vcxproj @@ -5,10 +5,6 @@ Dynamic Win32 - - Dynamic - x64 - languages - Chinese (Taiwan) @@ -21,20 +17,12 @@ v141_xp Unicode - - DynamicLibrary - v141 - Unicode - - - - <_ProjectFileVersion>14.0.25420.1 @@ -45,10 +33,6 @@ false $(MSBuildProjectName) - - false - $(MSBuildProjectName) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) @@ -67,28 +51,6 @@ Copying language DLL into debug directory if not exist ..\debug\lang md ..\debug\lang copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - - - $(OutDir)zh_TW.dll - Windows - true - true - true - - - Copying language DLL into debug directory - if not exist ..\debug\lang md ..\debug\lang -copy "$(TargetPath)" ..\debug\lang\$(TargetFileName) diff --git a/res/emule.manifest b/res/emule.manifest index a20b888c..fae1e3d5 100644 --- a/res/emule.manifest +++ b/res/emule.manifest @@ -4,7 +4,7 @@ name="eMule" processorArchitecture="x86" publicKeyToken="0000000000000000" - version="0.51.1.3" + version="0.51.2.1" /> eMule by https://www.emule-project.net diff --git a/res/emule.rc2 b/res/emule.rc2 index de12290f..dd11f528 100644 --- a/res/emule.rc2 +++ b/res/emule.rc2 @@ -36,7 +36,7 @@ BEGIN VALUE "FileDescription", "eMule" VALUE "FileVersion", SZ_VERSION_NAME " Unicode" VALUE "InternalName", "emule.exe" - VALUE "LegalCopyright", "Copyright © 2002-2018 Merkur - Read license.txt for more infos." + VALUE "LegalCopyright", "Copyright © 2002-2019 Merkur - Read license.txt for more infos." VALUE "OriginalFilename", "emule.exe" VALUE "ProductName", "eMule" VALUE "ProductVersion", SZ_VERSION_NAME " Unicode"