From e3427b51fdb0bcc5149091f38643b2589f9b56c8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Feb 2012 17:31:12 +0900 Subject: [PATCH] =?utf8?q?=E3=83=80=E3=83=96=E3=83=AB=E3=82=AF=E3=83=AA?= =?utf8?q?=E3=83=83=E3=82=AF=E5=87=A6=E7=90=86=E3=81=AB=E3=82=84=E3=82=84?= =?utf8?q?=E9=9B=A3=E6=9C=89=E3=82=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 179200 -> 180224 bytes nlite/nlite_commentview.cpp | 39 +++++++++++---------------------------- nlite/stdafx.h | 2 +- nlite_stub/nlib_stub.h | 2 +- nlite_stub/nlite_stub.cpp | 6 ++++++ 5 files changed, 19 insertions(+), 30 deletions(-) diff --git a/nlite.suo b/nlite.suo index 50f287c6d1744eba64a094221807ecad238990ba..53917da516072c8629503b0f2287ab673dc21434 100644 GIT binary patch delta 5928 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 delta 5924 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 I4hS&*8=Jx9HUIzs diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp index 51c276c..1f0e4c8 100644 --- a/nlite/nlite_commentview.cpp +++ b/nlite/nlite_commentview.cpp @@ -547,15 +547,16 @@ namespace nlite{ if(scrollFlag == TRUE){ - this->PostMessage(WM_VSCROLL,MAKEWORD(SB_BOTTOM,0),0); + this->SendMessage(WM_VSCROLL,MAKEWORD(SB_BOTTOM,0),0); } if(vScrollInfo.nPos + static_cast(vScrollInfo.nPage) >= vScrollInfo.nMax - static_cast(vScrollInfo.nPage)){ - m_commentListWindow.Invalidate(); + this->Invalidate(); - this->m_commentListWindow.PostMessage(UM_COMMENTVIEW_SETCTRL,NULL,NULL); + this->m_commentListWindow.SendMessageW(UM_COMMENTVIEW_SETCTRL,NULL,NULL); + this->UpdateWindow(); } return; @@ -567,16 +568,6 @@ namespace nlite{ return rgb; } - - - - - - - - - - LRESULT CCommentView::OnSize(UINT wParam,SIZE lParam){ ChangeSize(lParam); @@ -725,7 +716,6 @@ namespace nlite{ EndDeferWindowPos(hDwp); - this->SetScrollInfo(SB_HORZ,&hScrollInfo); } @@ -802,13 +792,10 @@ namespace nlite{ if(dy != 0){ vScrollInfo.nPos += dy; - // viewStartHeight = vScrollInfo.nPos; this->SetScrollPos(SB_VERT,vScrollInfo.nPos); this->commentlist.SetShortCut(this->GetScrollPos(SB_VERT)); - //this->SetScrollInfo(SB_VERT,&vScrollInfo); + this->Invalidate(); this->UpdateWindow(); - - m_commentListWindow.Invalidate(); this->m_commentListWindow.SendMessage(UM_COMMENTVIEW_SETCTRL,NULL,NULL); } @@ -821,8 +808,6 @@ namespace nlite{ m_header.Create(m_hWnd,0,WC_HEADER,WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | HDS_BUTTONS | HDS_HOTTRACK |HDS_DRAGDROP | HDS_FULLDRAG ,0,commentViewConstant::HEADER_ID); m_commentListWindow.Create(m_hWnd,0,commentViewConstant::NLITE_COMMENTLISTWINDOW,WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN , 0,commentViewConstant::LISTWINDOW); - - return 0; } @@ -1009,7 +994,6 @@ namespace nlite{ for(;chatData != endData && listRect.top < clientRect.bottom;++chatData){ CalcItemHeight(*chatData); -// dumpln(TEXT("height:%d"),chatData->viewData.height); listRect.bottom += chatData->viewData.height; headerRects[CCommentView::NO].top = listRect.top + SELL_SPACE_LENGTH; @@ -1136,10 +1120,6 @@ namespace nlite{ } } - /* - vScrollInfo.fMask = SIF_RANGE; - self.GetScrollInfo(SB_VERT,&vScrollInfo); - */ rslt = nMax+ 1; @@ -1155,7 +1135,7 @@ overclientrect: RECT userNameViewRect = headerRect[CCommentView::USERNAME]; //ƒ†[ƒU–¼•\Ž¦—̈æ RECT chatViewRect = headerRect[CCommentView::COMMENT]; //ƒRƒƒ“ƒg•\Ž¦—̈æ RECT timeViewRect = headerRect[CCommentView::TIME]; //ŽžŠÔ•\Ž¦—̈æ - RECT infoViewRect = headerRect[CCommentView::INFO]; //ƒRƒƒ“ƒgî•ñ•\Ž¦—̈æ + RECT infoViewRect = headerRect[CCommentView::INFO]; //ƒRƒƒ“ƒgî•ñ•\Ž¦—̈æ // @@ -1394,7 +1374,10 @@ end: } rc.bottom = rc.top + calcRect.bottom - calcRect.top; rc.right = rc.right > rc.left + calcRect.right - calcRect.left ? rc.left + calcRect.right - calcRect.left : rc.right; - rslt = (point.y >= rc.top && point.y <= rc.bottom && point.x >= rc.left && point.x <= rc.right); + + //À•W‚ªƒŠƒ“ƒN‘Ώە¶Žš—ñ“à‚É‚ ‚éê‡‚Ítrue‚ðÝ’è‚·‚é + rslt = (point.y >= rc.top && point.y <= rc.bottom && point.x >= rc.left && point.x <= rc.right) && + ((index ==CCommentView::NO && clickData->no != 0) ||index ==CCommentView::USERNAME); break; @@ -1449,9 +1432,9 @@ end: VOID CCommentListWindow::OnLButtonDblClk(UINT wParam, _WTYPES_NS::CPoint &point){ - if(!(point.x > (INT_PTR)self.GetColumnHolSizeSum() || self.commentlist.empty() == TRUE)){ + auto end = self.commentlist.end(); auto lineIte = CalcClickLine(point.y); if( lineIte == end)goto endlabel; diff --git a/nlite/stdafx.h b/nlite/stdafx.h index 9ca4bf1..4954d9e 100644 --- a/nlite/stdafx.h +++ b/nlite/stdafx.h @@ -11,7 +11,7 @@ #define WIN32_LEAN_AND_MEAN // Windows ƒwƒbƒ_[‚©‚çŽg—p‚³‚ê‚Ä‚¢‚È‚¢•”•ª‚ðœŠO‚µ‚Ü‚·B #define _CRT_SECURE_NO_WARNINGS 1 //vc++‚Ì‚¨‚¹‚Á‚©‚¢‚ÈŒx‚ðÁ‚· #define _CRT_NON_CONFORMING_SWPRINTFS 1 //vc++‚Ì‚¨‚¹‚Á‚©‚¢‚ÈŒx‚ðÁ‚· -//#define USE_STUB //ƒXƒ^ƒu‚ðŽg—p‚·‚éê‡‚̓Rƒƒ“ƒgƒAƒEƒg‚ð‰ðœ‚·‚é +#define USE_STUB //ƒXƒ^ƒu‚ðŽg—p‚·‚éê‡‚̓Rƒƒ“ƒgƒAƒEƒg‚ð‰ðœ‚·‚é #define WINDEBUGER_NOPRINTING //ƒfƒoƒbƒOo—Í‚ðƒRƒ“ƒ\[ƒ‹‚É•\Ž¦‚µ‚½‚­‚È‚¢ê‡’è‹`‚·‚é #define _WTL_NO_CSTRING diff --git a/nlite_stub/nlib_stub.h b/nlite_stub/nlib_stub.h index 036bddf..c592a17 100644 --- a/nlite_stub/nlib_stub.h +++ b/nlite_stub/nlib_stub.h @@ -30,6 +30,6 @@ typedef struct nicolivestream_t{ #define STARTRECEVECOUNT 1000 -#define RECEVECOUNT 1 +#define RECEVECOUNT 65536 #define ONERECEVECHATCOUNT 3 \ No newline at end of file diff --git a/nlite_stub/nlite_stub.cpp b/nlite_stub/nlite_stub.cpp index 981d6f6..01cb47b 100644 --- a/nlite_stub/nlite_stub.cpp +++ b/nlite_stub/nlite_stub.cpp @@ -162,6 +162,12 @@ VOID NicoLiveStrream_setResFrom(NicoLiveStream_P self,INT_PTR res){ return; } + +NLIB_RESULT NicoLiveStream_sendOwnerChat(NicoLiveStream_P self,LPCTSTR chatbuf,LPCTSTR *mail,LPCTSTR *extends){ + + return NLIB_ERR_OK; +} + unsigned int WINAPI commentthread(VOID *usadata){ NicoLiveStream_P self = (NicoLiveStream_P)usadata; -- 2.11.0