Ok to discuss CVS here ?

Guitarm · Post by **Guitarm** » 2004-08-06 08:22

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

Post by **GargoyleMT** » 2004-08-07 14:13

There's an assertion if you run in debug mode, and you Download To... > in the file list. I think FarCry patched this in the searchframe, but the code in directorylistingfrm may also need fixing.

Guitarm · Post by **Guitarm** » 2004-08-07 16:52

Ok, thanks for the info

Regards

Post by **GargoyleMT** » 2004-08-07 17:12

Guitarm wrote:Ok, thanks for the info

Regards

try this, which should be in cvs shortly (I hope):

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)

patch -p1 < (patch file) in your dc++ source dir.

Post by **GargoyleMT** » 2004-08-07 17:13

I tried it with a lot of combinations, I think it's the right fix, but more testing doesn't hurt...

Guitarm · Post by **Guitarm** » 2004-08-07 17:29

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

TheParanoidOne · Post by **TheParanoidOne** » 2004-08-07 19:10

If your codebase is modified, that might explain the failure. Just read the diff and make the changes manually.

Guitarm · Post by **Guitarm** » 2004-08-07 19:21

TheParanoidOne wrote:If your codebase is modified, that might explain the failure. Just read the diff and make the changes manually.

Yes, it's modified, I'll try the manual way, thanks !

Post by **GargoyleMT** » 2004-08-07 21:59

Plus, it's best to edit/quote my post and copy it out there. Otherwise, there may be wrapping.

TheParanoidOne · Post by **TheParanoidOne** » 2004-08-07 22:22

I copy/pasted straight from the page and it was fine.

Post by **GargoyleMT** » 2004-08-07 22:43

TheParanoidOne wrote:I copy/pasted straight from the page and it was fine.

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?

Guitarm · Post by **Guitarm** » 2004-08-07 23:15

Yeah, I'll try with the edit also to verify if there's a diff, thanks

Regards

TheParanoidOne · Post by **TheParanoidOne** » 2004-08-07 23:42

GargoyleMT wrote:
TheParanoidOne wrote:I copy/pasted straight from the page and it was fine.

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?

Strange. I'm not seeing any line breakage with either Opera, FF or (ugh) IE.

But that's gets us dangerously off topic though.

Ok to discuss CVS here ?

Ok to discuss CVS here ?

Who is online