Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [646] dcplusplus/trunk
|
From: <arn...@us...> - 2006-09-10 19:04:52
|
Revision: 646
http://svn.sourceforge.net/dcplusplus/?rev=646&view=rev
Author: arnetheduck
Date: 2006-09-10 12:03:10 -0700 (Sun, 10 Sep 2006)
Log Message:
-----------
Patches and small fixes
Modified Paths:
--------------
dcplusplus/trunk/DCPlusPlus.rc
dcplusplus/trunk/DCPlusPlus.vcproj
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/client/DCPlusPlus.h
dcplusplus/trunk/client/NmdcHub.cpp
dcplusplus/trunk/client/SettingsManager.cpp
dcplusplus/trunk/client/User.cpp
dcplusplus/trunk/client/User.h
dcplusplus/trunk/client/Util.cpp
dcplusplus/trunk/client/version.h
dcplusplus/trunk/help/changelog.html
dcplusplus/trunk/windows/AboutDlg.h
dcplusplus/trunk/windows/DirectoryListingFrm.cpp
dcplusplus/trunk/windows/FlatTabCtrl.h
dcplusplus/trunk/windows/HubFrame.cpp
dcplusplus/trunk/windows/HubFrame.h
dcplusplus/trunk/windows/MainFrm.h
dcplusplus/trunk/windows/NetworkPage.cpp
Modified: dcplusplus/trunk/DCPlusPlus.rc
===================================================================
--- dcplusplus/trunk/DCPlusPlus.rc 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/DCPlusPlus.rc 2006-09-10 19:03:10 UTC (rev 646)
@@ -97,6 +97,9 @@
DEFPUSHBUTTON "OK",IDOK,96,266,50,14
ICON IDR_MAINFRAME,IDC_STATIC,110,15,21,20
GROUPBOX "",IDC_STATIC,7,7,229,102
+ EDITTEXT IDC_TTH,35,93,196,12,ES_AUTOHSCROLL | ES_READONLY | NOT
+ WS_BORDER
+ LTEXT "TTH:",IDC_STATIC,13,93,18,12
GROUPBOX "Greetz && Contributors",IDC_STATIC,7,112,229,82,
BS_CENTER
GROUPBOX "Latest version",IDC_STATIC,7,239,229,24,BS_CENTER
@@ -108,9 +111,6 @@
EDITTEXT IDC_THANKS,13,122,218,66,ES_MULTILINE | ES_READONLY |
WS_VSCROLL
CTEXT "Static",IDC_VERSION,13,37,218,54
- EDITTEXT IDC_TTH,35,93,196,12,ES_AUTOHSCROLL | ES_READONLY | NOT
- WS_BORDER
- LTEXT "TTH:",IDC_STATIC,13,93,18,12
END
IDD_LINE DIALOGEX 0, 0, 239, 46
@@ -526,6 +526,9 @@
LTEXT "MiB",IDC_SETTINGS_MB,117,78,14,8
LTEXT "PID",IDC_STATIC,52,95,12,8
EDITTEXT IDC_PRIVATE_ID,69,92,45,14,ES_AUTOHSCROLL
+ LTEXT "Auto refresh time",IDC_SETTINGS_AUTO_REFRESH_TIME,7,113,
+ 57,8
+ EDITTEXT IDC_AUTO_REFRESH_TIME,69,110,45,14,ES_AUTOHSCROLL
RTEXT "File write buffer",IDC_SETTINGS_WRITE_BUFFER,139,10,65,
8
EDITTEXT IDC_BUFFERSIZE,208,7,41,14,ES_AUTOHSCROLL
@@ -547,9 +550,6 @@
96,76,8
EDITTEXT IDC_SOCKET_OUT_BUFFER,208,93,41,14,ES_AUTOHSCROLL
LTEXT "B",IDC_STATIC,252,96,8,8
- LTEXT "Auto refresh time",IDC_SETTINGS_AUTO_REFRESH_TIME,7,113,
- 57,8
- EDITTEXT IDC_AUTO_REFRESH_TIME,69,110,45,14,ES_AUTOHSCROLL
EDITTEXT IDC_AUTO_SEARCH_LIMIT,208,111,41,14,ES_AUTOHSCROLL
LTEXT "Auto-search limit",IDC_SETTINGS_AUTO_SEARCH_LIMIT,148,
113,56,13
Modified: dcplusplus/trunk/DCPlusPlus.vcproj
===================================================================
--- dcplusplus/trunk/DCPlusPlus.vcproj 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/DCPlusPlus.vcproj 2006-09-10 19:03:10 UTC (rev 646)
@@ -48,7 +48,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /SAFESEH:NO"
- AdditionalDependencies="libunicows.lib kernel32.lib advapi32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib version.lib mpr.lib rasapi32.lib winmm.lib winspool.lib vfw32.lib secur32.lib oleacc.lib oledlg.lib sensapi.lib htmlhelp.lib ws2_32.lib"
+ AdditionalDependencies="libunicows.lib SHFolder.lib kernel32.lib advapi32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib version.lib mpr.lib rasapi32.lib winmm.lib winspool.lib vfw32.lib secur32.lib oleacc.lib oledlg.lib sensapi.lib htmlhelp.lib ws2_32.lib"
OutputFile="$(SolutionDir)App/$(ProjectName).exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
@@ -127,7 +127,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/FIXED:NO /SAFESEH:NO"
- AdditionalDependencies="libunicows.lib kernel32.lib advapi32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib version.lib mpr.lib rasapi32.lib winmm.lib winspool.lib vfw32.lib secur32.lib oleacc.lib oledlg.lib sensapi.lib htmlhelp.lib ws2_32.lib"
+ AdditionalDependencies="libunicows.lib SHFolder.lib kernel32.lib advapi32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib version.lib mpr.lib rasapi32.lib winmm.lib winspool.lib vfw32.lib secur32.lib oleacc.lib oledlg.lib sensapi.lib htmlhelp.lib ws2_32.lib"
OutputFile="$(SolutionDir)App/$(ProjectName).exe"
Version=""
LinkIncremental="1"
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/changelog.txt 2006-09-10 19:03:10 UTC (rev 646)
@@ -1,4 +1,4 @@
--- --
+-- 0.695 2006-09-10 --
* PM popup/ignore options updated, in nmdc a hub is any nick which hasn't sent a hello or myinfo, and a bot is a nick with myinfo
without connection type
* [bug 125] Fixed out-of-order PM/quit
@@ -17,6 +17,15 @@
* [bug 1032] Fixed certificates help (thanks pothead)
* Added possibility to store configuration files in separate directory
* Switched back to unicows for w9x users, opencow was missing too many functions
+* [bug 876] Fixed lost tooltips (thanks poy and bigmuscle)
+* [bug 1041] Fixed about tab order (thanks pothead)
+* [bug 1042] Fixed experts tab order (thanks pothead)
+* [bug 1047] Fixed possible nmdc crash (thanks guitarm)
+* [bug 1049] Added tooltip to tab bar (thanks poy)
+* [bug 1053] Fixed vista detection (thanks ullner)
+* [bug 988] Fixed duplicate nicks
+* [bug 1015] Fixed chevron text
+* Default hub lists updated
-- 0.694 2006-07-10 --
* Fixed crash in certificates page
Modified: dcplusplus/trunk/client/DCPlusPlus.h
===================================================================
--- dcplusplus/trunk/client/DCPlusPlus.h 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/client/DCPlusPlus.h 2006-09-10 19:03:10 UTC (rev 646)
@@ -23,6 +23,10 @@
#pragma once
#endif // _MSC_VER > 1000
+#ifdef _WIN32
+#define snprintf _snprintf
+#endif
+
#ifdef _DEBUG
inline void CDECL debugTrace(const char* format, ...)
@@ -41,10 +45,6 @@
va_end(args);
}
-#ifdef _WIN32
-#define snprintf _snprintf
-#endif
-
#define dcdebug debugTrace
#ifdef _WIN32
#define dcassert(exp) \
Modified: dcplusplus/trunk/client/NmdcHub.cpp
===================================================================
--- dcplusplus/trunk/client/NmdcHub.cpp 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/client/NmdcHub.cpp 2006-09-10 19:03:10 UTC (rev 646)
@@ -202,7 +202,13 @@
return;
}
string nick = line.substr(1, i-1);
- string message = line.substr(i+2);
+ string message;
+ if((line.length()-1) > i) {
+ message = line.substr(i+2);
+ } else {
+ fire(ClientListener::StatusMessage(), this, unescape(line));
+ return;
+ }
OnlineUser* ou = findUser(nick);
if(ou) {
@@ -689,7 +695,7 @@
}
if(from == 0) {
// Assume it's from the hub
- from = &getUser(rtNick);
+ from = &getUser(fromNick);
from->getIdentity().setHub(true);
from->getIdentity().setHidden(true);
fire(ClientListener::UserUpdated(), this, *from);
@@ -698,8 +704,8 @@
// Update pointers just in case they've been invalidated
replyTo = findUser(rtNick);
from = findUser(fromNick);
-
- }
+ }
+
OnlineUser& to = getUser(getMyNick());
fire(ClientListener::PrivateMessage(), this, *from, to, *replyTo, unescape(msg));
} else if(cmd == "$GetPass") {
Modified: dcplusplus/trunk/client/SettingsManager.cpp
===================================================================
--- dcplusplus/trunk/client/SettingsManager.cpp 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/client/SettingsManager.cpp 2006-09-10 19:03:10 UTC (rev 646)
@@ -135,7 +135,7 @@
setDefault(IGNORE_BOT_PMS, false);
setDefault(LIST_DUPES, true);
setDefault(BUFFER_SIZE, 64);
- setDefault(HUBLIST_SERVERS, "http://www.hublist.org/PublicHubList.xml.bz2;http://dc.selwerd.nl/hublist.xml.bz2");
+ setDefault(HUBLIST_SERVERS, "http://hubs.bandicoot.nl/;http://www.hublist.org/PublicHubList.xml.bz2");
setDefault(DOWNLOAD_SLOTS, 3);
setDefault(MAX_DOWNLOAD_SPEED, 0);
setDefault(LOG_DIRECTORY, Util::getConfigPath() + "Logs" PATH_SEPARATOR_STR);
Modified: dcplusplus/trunk/client/User.cpp
===================================================================
--- dcplusplus/trunk/client/User.cpp 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/client/User.cpp 2006-09-10 19:03:10 UTC (rev 646)
@@ -28,7 +28,10 @@
}
+RWLock<> Identity::rw;
+
void Identity::getParams(StringMap& sm, const string& prefix, bool compatibility) const {
+ RLock<> l(rw);
for(InfMap::const_iterator i = info.begin(); i != info.end(); ++i) {
sm[prefix + string((char*)(&i->first), 2)] = i->second;
}
Modified: dcplusplus/trunk/client/User.h
===================================================================
--- dcplusplus/trunk/client/User.h 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/client/User.h 2006-09-10 19:03:10 UTC (rev 646)
@@ -27,6 +27,7 @@
#include "Pointer.h"
#include "CID.h"
#include "FastAlloc.h"
+#include "CriticalSection.h"
/** A user connected to one or more hubs. */
class User : public FastAlloc<User>, public PointerBase, public Flags
@@ -136,11 +137,13 @@
bool isUdpActive() const { return !getIp().empty() && !getUdpPort().empty(); }
const string& get(const char* name) const {
+ RLock<> l(rw);
InfMap::const_iterator i = info.find(*(short*)name);
return i == info.end() ? Util::emptyString : i->second;
}
void set(const char* name, const string& val) {
+ WLock<> l(rw);
if(val.empty())
info.erase(*(short*)name);
else
@@ -159,6 +162,8 @@
typedef map<short, string> InfMap;
typedef InfMap::iterator InfIter;
InfMap info;
+ /** @todo there are probably more threading issues here ...*/
+ static RWLock<> rw;
};
class Client;
Modified: dcplusplus/trunk/client/Util.cpp
===================================================================
--- dcplusplus/trunk/client/Util.cpp 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/client/Util.cpp 2006-09-10 19:03:10 UTC (rev 646)
@@ -831,6 +831,8 @@
os += " Server";
else if(ver.wProductType & VER_NT_DOMAIN_CONTROLLER)
os += " DC";
+ } else if(ver.dwMajorVersion == 6) {
+ os = "WinVista";
}
if(ver.wServicePackMajor != 0) {
Modified: dcplusplus/trunk/client/version.h
===================================================================
--- dcplusplus/trunk/client/version.h 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/client/version.h 2006-09-10 19:03:10 UTC (rev 646)
@@ -17,8 +17,8 @@
*/
#define APPNAME "DC++"
-#define VERSIONSTRING "0.694"
-#define VERSIONFLOAT 0.694
+#define VERSIONSTRING "0.695"
+#define VERSIONFLOAT 0.695
/* Update the .rc file as well... */
Modified: dcplusplus/trunk/help/changelog.html
===================================================================
--- dcplusplus/trunk/help/changelog.html 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/help/changelog.html 2006-09-10 19:03:10 UTC (rev 646)
@@ -13,6 +13,36 @@
<h1>DC++ Changelog</h1>
See the version history of DC++ below.
+<h2>0.695 <span style="color: gray;">(2006-09-10)</span></h2>
+<ul>
+ <li>PM popup/ignore options updated, in nmdc a hub is any nick which hasn't sent a hello or myinfo, and a bot is a nick with myinfo without connection type</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=125">[bug 125]</a> Fixed out-of-order PM/quit</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=224">[bug 224]</a> Slots are no longer granted to disconnected users, instead disconnection is delayed a minute</li>
+ <li>[NMDC] Fixed extra space in chat</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=395">[bug 395]</a> Fixed password being blanked</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=419">[bug 419]</a> Allowed changing case only when moving file in queue</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=736">[bug 736]</a> Fixed escaping of menu items</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1013">[bug 1013]</a> Fixed gcc warnings (thanks steven sheehy)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1023">[bug 1023]</a> Fixed some large stack allocations (thanks steven sheehy)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1026">[bug 1026]</a> Fixed some potential buffer overflows (thanks steven sheehy)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1027">[bug 1027]</a> Improved unix socket support (thanks steven sheehy)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1028">[bug 1028]</a> Improved big endian support (thanks steven sheehy)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1029">[bug 1029]</a> Fixed BSD compile issue (thanks steven sheehy)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1031">[bug 1031]</a> Fixed a crash after closing hub window (thanks bigmuscle/pothead)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1032">[bug 1032]</a> Fixed certificates help (thanks pothead)</li>
+ <li>Added possibility to store configuration files in separate directory</li>
+ <li>Switched back to unicows for w9x users, opencow was missing too many functions</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=876">[bug 876]</a> Fixed lost tooltips (thanks poy and bigmuscle)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1041">[bug 1041]</a> Fixed about tab order (thanks pothead)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1042">[bug 1042]</a> Fixed experts tab order (thanks pothead)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1047">[bug 1047]</a> Fixed possible nmdc crash (thanks guitarm)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1049">[bug 1049]</a> Added tooltip to tab bar (thanks poy)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1053">[bug 1053]</a> Fixed vista detection (thanks ullner)</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=988">[bug 988]</a> Fixed duplicate nicks</li>
+ <li><a href="http://dcpp.net/bugzilla/show_bug.cgi?id=1015">[bug 1015]</a> Fixed chevron text</li>
+ <li>Default hub lists updated</li>
+</ul>
+
<h2>0.694 <span style="color: gray;">(2006-07-10)</span></h2>
<ul>
<li>Fixed crash in certificates page</li>
Modified: dcplusplus/trunk/windows/AboutDlg.h
===================================================================
--- dcplusplus/trunk/windows/AboutDlg.h 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/windows/AboutDlg.h 2006-09-10 19:03:10 UTC (rev 646)
@@ -42,7 +42,7 @@
_T("defr, ullner, fleetcommand, liny, xan, olle svensson, mark gillespie, jeremy huddleston, ")
_T("bsod, sulan, jonathan stone, tim burton, izzzo, guitarm, paka, nils maier, jens oknelid, yoji, ")
_T("krzysztof tyszecki, poison, pothead, pur, bigmuscle, martin, jove, bart vullings, ")
-_T("steven sheehy, tobias nygren. ")
+_T("steven sheehy, tobias nygren, poy. ")
_T("Keep it coming!");
class AboutDlg : public CDialogImpl<AboutDlg>, private HttpConnectionListener
Modified: dcplusplus/trunk/windows/DirectoryListingFrm.cpp
===================================================================
--- dcplusplus/trunk/windows/DirectoryListingFrm.cpp 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/windows/DirectoryListingFrm.cpp 2006-09-10 19:03:10 UTC (rev 646)
@@ -212,6 +212,7 @@
updateTree(*i, ht);
}
}
+
void DirectoryListingFrame::refreshTree(const tstring& root) {
ctrlTree.SetRedraw(FALSE);
@@ -365,6 +366,7 @@
history = tmp;
}
}
+
void DirectoryListingFrame::forward() {
if(history.size() > 1 && historyIndex < history.size()) {
size_t n = min(historyIndex, history.size() - 1);
Modified: dcplusplus/trunk/windows/FlatTabCtrl.h
===================================================================
--- dcplusplus/trunk/windows/FlatTabCtrl.h 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/windows/FlatTabCtrl.h 2006-09-10 19:03:10 UTC (rev 646)
@@ -183,6 +183,7 @@
MESSAGE_HANDLER(WM_LBUTTONDOWN, onLButtonDown)
MESSAGE_HANDLER(WM_LBUTTONUP, onLButtonUp)
MESSAGE_HANDLER(WM_CONTEXTMENU, onContextMenu)
+ MESSAGE_HANDLER(WM_MOUSEMOVE, onMouseMove)
COMMAND_ID_HANDLER(IDC_CLOSE_WINDOW, onCloseWindow)
COMMAND_ID_HANDLER(IDC_CHEVRON, onChevron)
COMMAND_RANGE_HANDLER(IDC_SELECT_WINDOW, IDC_SELECT_WINDOW+tabs.size(), onSelectWindow)
@@ -268,6 +269,37 @@
return 0;
}
+ LRESULT onMouseMove(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
+ POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; // location of mouse click
+
+ int xPos = pt.x;
+ int row = rows - ((pt.y / height) + 1);
+
+ for(TabInfo::ListIter i = tabs.begin(); i != tabs.end(); ++i) {
+ TabInfo* t = *i;
+ if((row == t->row) && (xPos >= t->xpos) && (xPos < (t->xpos + t->getWidth()))) {
+ // Bingo, the mouse was over this one
+ int len = ::GetWindowTextLength(t->hWnd) + 1;
+ if(len >= TabInfo::MAX_LENGTH) {
+ TCHAR* buf = new TCHAR[len];
+ ::GetWindowText(t->hWnd, buf, len);
+ if(buf != current_tip) {
+ tab_tip.DelTool(m_hWnd);
+ CToolInfo ti(TTF_SUBCLASS, m_hWnd, 0, NULL, buf);
+ tab_tip.AddTool(&ti);
+ tab_tip.Activate(TRUE);
+ current_tip = buf;
+ }
+ delete[] buf;
+ return 1;
+ }
+ }
+ }
+ tab_tip.Activate(FALSE);
+ current_tip = _T("");
+ return 1;
+ }
+
LRESULT onCloseWindow(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
if(::IsWindow(closing))
::SendMessage(closing, WM_CLOSE, 0, 0);
@@ -323,10 +355,12 @@
LRESULT onCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
chevron.Create(m_hWnd, rcDefault, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN |
BS_PUSHBUTTON , 0, IDC_CHEVRON);
- chevron.SetWindowText(_T("�"));
+ chevron.SetWindowText(_T("\u00bb"));
mnu.CreatePopupMenu();
+ tab_tip.Create(m_hWnd, rcDefault, NULL, TTS_ALWAYSTIP | TTS_NOPREFIX);
+
CDC dc(::GetDC(m_hWnd));
HFONT oldfont = dc.SelectFont(WinUtil::font);
height = WinUtil::getTextHeight(dc) + 2;
@@ -542,10 +576,13 @@
HWND closing;
CButton chevron;
CMenu mnu;
+ CToolTipCtrl tab_tip;
int rows;
int height;
+ tstring current_tip;
+
TabInfo* active;
TabInfo* moving;
typename TabInfo::List tabs;
Modified: dcplusplus/trunk/windows/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/windows/HubFrame.cpp 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/windows/HubFrame.cpp 2006-09-10 19:03:10 UTC (rev 646)
@@ -161,6 +161,13 @@
}
}
+LRESULT HubFrame::OnForwardMsg(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
+ LPMSG pMsg = (LPMSG)lParam;
+ if((pMsg->message >= WM_MOUSEFIRST) && (pMsg->message <= WM_MOUSELAST))
+ ctrlLastLines.RelayEvent(pMsg);
+ return 0;
+}
+
void HubFrame::onEnter() {
if(ctrlMessage.GetWindowTextLength() > 0) {
AutoArray<TCHAR> msg(ctrlMessage.GetWindowTextLength()+1);
Modified: dcplusplus/trunk/windows/HubFrame.h
===================================================================
--- dcplusplus/trunk/windows/HubFrame.h 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/windows/HubFrame.h 2006-09-10 19:03:10 UTC (rev 646)
@@ -62,6 +62,7 @@
MESSAGE_HANDLER(WM_CLOSE, onClose)
MESSAGE_HANDLER(WM_SETFOCUS, onSetFocus)
MESSAGE_HANDLER(WM_CREATE, OnCreate)
+ MESSAGE_HANDLER(WM_FORWARDMSG, OnForwardMsg)
MESSAGE_HANDLER(WM_SPEAKER, onSpeaker)
MESSAGE_HANDLER(WM_CONTEXTMENU, onContextMenu)
MESSAGE_HANDLER(WM_CTLCOLORSTATIC, onCtlColor)
@@ -91,6 +92,7 @@
COMMAND_CODE_HANDLER(CBN_SELCHANGE, onSelChange)
END_MSG_MAP()
+ LRESULT OnForwardMsg(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
LRESULT onSpeaker(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/);
LRESULT onCopyNick(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
LRESULT onCopyHub(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
Modified: dcplusplus/trunk/windows/MainFrm.h
===================================================================
--- dcplusplus/trunk/windows/MainFrm.h 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/windows/MainFrm.h 2006-09-10 19:03:10 UTC (rev 646)
@@ -61,6 +61,9 @@
virtual BOOL PreTranslateMessage(MSG* pMsg)
{
+ if((pMsg->message >= WM_MOUSEFIRST) && (pMsg->message <= WM_MOUSELAST))
+ ctrlLastLines.RelayEvent(pMsg);
+
if(CMDIFrameWindowImpl<MainFrame>::PreTranslateMessage(pMsg))
return TRUE;
Modified: dcplusplus/trunk/windows/NetworkPage.cpp
===================================================================
--- dcplusplus/trunk/windows/NetworkPage.cpp 2006-09-04 15:16:01 UTC (rev 645)
+++ dcplusplus/trunk/windows/NetworkPage.cpp 2006-09-10 19:03:10 UTC (rev 646)
@@ -113,8 +113,8 @@
{
PropPage::translate((HWND)(*this), texts);
- if(!(WinUtil::getOsMajor() >= 5 && WinUtil::getOsMinor() >= 1 ) //WinXP & WinSvr2003
- || WinUtil::getOsMajor() >= 6 ) //Longhorn
+ if(!(WinUtil::getOsMajor() >= 5 && WinUtil::getOsMinor() >= 1 //WinXP & WinSvr2003
+ || WinUtil::getOsMajor() >= 6 )) //Vista
{
::EnableWindow(GetDlgItem(IDC_FIREWALL_UPNP), FALSE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
