Ok to discuss CVS here ?
Moderator: Moderators
Ok to discuss CVS here ?
I'm aware of the problems discussing CVS version considering version and so and so...If it's not allowed in here please tell me so and if it's any idea to discuss CVS at all?.
Anyway, got this one from CVS (latest change as of yesterday) when trying to download/save a file, I assume it's the framework that gives me this, right ? (I'm on XP Prof ,stlport 4.6.2, wtl 7.1, both from DC++ site). Can someone just explain if this is a DC++ problem (DC++ crashed but didn't leave a exceptioninfo.txt so.......) or a Windows XP problem (Which I hope )
Regards
Anyway, got this one from CVS (latest change as of yesterday) when trying to download/save a file, I assume it's the framework that gives me this, right ? (I'm on XP Prof ,stlport 4.6.2, wtl 7.1, both from DC++ site). Can someone just explain if this is a DC++ problem (DC++ crashed but didn't leave a exceptioninfo.txt so.......) or a Windows XP problem (Which I hope )
Regards
"Nothing really happens fast. Everything happens at such a rate that by the time it happens, it all seems normal."
-
- DC++ Contributor
- Posts: 3212
- Joined: 2003-01-07 21:46
- Location: .pa.us
-
- DC++ Contributor
- Posts: 3212
- Joined: 2003-01-07 21:46
- Location: .pa.us
try this, which should be in cvs shortly (I hope):Guitarm wrote:Ok, thanks for the info
Regards
Code: Select all
diff -urd DCPlusPlus-cvs.orig/windows/DirectoryListingFrm.cpp DCPlusPlus-cvs/windows/DirectoryListingFrm.cpp
--- DCPlusPlus-cvs.orig/windows/DirectoryListingFrm.cpp Mon Aug 2 19:46:16 2004
+++ DCPlusPlus-cvs/windows/DirectoryListingFrm.cpp Sat Aug 7 11:58:24 2004
@@ -560,7 +560,7 @@
}
LRESULT DirectoryListingFrame::onDownloadTarget(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
- int newId = wID - IDC_DOWNLOAD_TARGET;
+ int newId = wID - IDC_DOWNLOAD_TARGET - 1;
dcassert(newId >= 0);
if(ctrlList.GetSelectedCount() == 1) {
@@ -590,7 +590,7 @@
}
LRESULT DirectoryListingFrame::onDownloadTargetDir(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
- int newId = wID - IDC_DOWNLOAD_TARGET_DIR;
+ int newId = wID - IDC_DOWNLOAD_TARGET_DIR - 1;
dcassert(newId >= 0);
HTREEITEM t = ctrlTree.GetSelectedItem();
diff -urd DCPlusPlus-cvs.orig/windows/DirectoryListingFrm.h DCPlusPlus-cvs/windows/DirectoryListingFrm.h
--- DCPlusPlus-cvs.orig/windows/DirectoryListingFrm.h Tue Jul 27 21:30:32 2004
+++ DCPlusPlus-cvs/windows/DirectoryListingFrm.h Sat Aug 7 11:52:45 2004
@@ -83,8 +83,8 @@
COMMAND_ID_HANDLER(IDC_SEARCH_BY_TTH, onSearchByTTH)
COMMAND_ID_HANDLER(IDC_BITZI_LOOKUP, onBitziLookup)
COMMAND_ID_HANDLER(IDC_COPY_MAGNET, onCopyMagnet)
- COMMAND_RANGE_HANDLER(IDC_DOWNLOAD_TARGET, IDC_DOWNLOAD_TARGET + max(targets.size(), WinUtil::lastDirs.size()), onDownloadTarget)
- COMMAND_RANGE_HANDLER(IDC_DOWNLOAD_TARGET, IDC_DOWNLOAD_TARGET_DIR + WinUtil::lastDirs.size(), onDownloadTargetDir)
+ COMMAND_RANGE_HANDLER(IDC_DOWNLOAD_TARGET, IDC_DOWNLOAD_TARGET + targets.size() + WinUtil::lastDirs.size(), onDownloadTarget)
+ COMMAND_RANGE_HANDLER(IDC_DOWNLOAD_TARGET_DIR, IDC_DOWNLOAD_TARGET_DIR + WinUtil::lastDirs.size(), onDownloadTargetDir)
CHAIN_MSG_MAP(baseClass)
CHAIN_MSG_MAP(CSplitterImpl<DirectoryListingFrame>)
ALT_MSG_MAP(STATUS_MESSAGE_MAP)
-
- DC++ Contributor
- Posts: 3212
- Joined: 2003-01-07 21:46
- Location: .pa.us
Thanks, I tried it but I got some errors:
F:\DCPlusPlus\DCPlusPlus-CVS-src\modified\dcplusplus>patch -p1 < CVS_GargFixOfFrameWorkCrash.diff
patching file windows/DirectoryListingFrm.cpp
Hunk #1 FAILED at 560.
Hunk #2 FAILED at 590.
2 out of 2 hunks FAILED -- saving rejects to file windows/DirectoryListingFrm.cpp.rej
patching file windows/DirectoryListingFrm.h
patch unexpectedly ends in middle of line
Hunk #1 FAILED at 83.
1 out of 1 hunk FAILED -- saving rejects to file windows/DirectoryListingFrm.h.rej
But it's ok, I'll wait for the next CVS change
Regards
F:\DCPlusPlus\DCPlusPlus-CVS-src\modified\dcplusplus>patch -p1 < CVS_GargFixOfFrameWorkCrash.diff
patching file windows/DirectoryListingFrm.cpp
Hunk #1 FAILED at 560.
Hunk #2 FAILED at 590.
2 out of 2 hunks FAILED -- saving rejects to file windows/DirectoryListingFrm.cpp.rej
patching file windows/DirectoryListingFrm.h
patch unexpectedly ends in middle of line
Hunk #1 FAILED at 83.
1 out of 1 hunk FAILED -- saving rejects to file windows/DirectoryListingFrm.h.rej
But it's ok, I'll wait for the next CVS change
Regards
"Nothing really happens fast. Everything happens at such a rate that by the time it happens, it all seems normal."
-
- Forum Moderator
- Posts: 1420
- Joined: 2003-04-22 14:37
Yes, it's modified, I'll try the manual way, thanks !TheParanoidOne wrote:If your codebase is modified, that might explain the failure. Just read the diff and make the changes manually.
"Nothing really happens fast. Everything happens at such a rate that by the time it happens, it all seems normal."
-
- DC++ Contributor
- Posts: 3212
- Joined: 2003-01-07 21:46
- Location: .pa.us
-
- Forum Moderator
- Posts: 1420
- Joined: 2003-04-22 14:37
-
- DC++ Contributor
- Posts: 3212
- Joined: 2003-01-07 21:46
- Location: .pa.us
-
- Forum Moderator
- Posts: 1420
- Joined: 2003-04-22 14:37
Strange. I'm not seeing any line breakage with either Opera, FF or (ugh) IE.GargoyleMT wrote:IE seems to copy differently than FireFox. FF is closer to the patch, though the tabs don't make it through on it. Maybe a browser difference?TheParanoidOne wrote:I copy/pasted straight from the page and it was fine.
But that's gets us dangerously off topic though.