2012/01/21 15:43:00

diff --git a/nlib/nlib_nicoLive.c b/nlib/nlib_nicoLive.c
index 6b4fa86..daa41de 100644 (file)
--- a/nlib/nlib_nicoLive.c
+++ b/nlib/nlib_nicoLive.c
@@ -242,15 +242,6 @@ NicoLiveStream_P NicoLiveStream_new(){
        self->chatManager.hKeapALiveHandle = (HANDLE)_beginthreadex(NULL,0,NicoLiveKeapALiveThread,self,0,&self->chatManager.keapALiveThreadID);
 
 
-
-       
-
-       
-
-       dumpln(TEXT("size%d"),sizeof(NicoLiveStream));
-
-       
-
        return self;
 }
 

diff --git a/nlite.suo b/nlite.suo
index 1821db2..cdb9b45 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ

diff --git a/nlite/nlite_commentWrite.cpp b/nlite/nlite_commentWrite.cpp
index d63abcd..c80ed5e 100644 (file)
--- a/nlite/nlite_commentWrite.cpp
+++ b/nlite/nlite_commentWrite.cpp
@@ -116,7 +116,7 @@ LRESULT CCommentWriteWindow::OnCreate(LPCREATESTRUCT lpReateStruct){
        commentSizeBox.Create(m_hWnd,0,WC_COMBOBOX,WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST,0,COMMENTSIZE_BOX);
        commentColorBox.Create(m_hWnd,0,WC_COMBOBOX,WS_CHILD | WS_VISIBLE  | CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED        ,0,COMMENTCOLOR_BOX);
        anonymousButton.Create(m_hWnd,0,WC_BUTTON,WS_CHILD | WS_VISIBLE | BS_CHECKBOX | BS_AUTOCHECKBOX ,0,ANONYMOUS_BUTTON);
-       commentEdit.Create(m_hWnd,0,WC_EDIT,WS_CHILD | WS_VISIBLE | WS_BORDER,0,COMMENT_EDIT);
+       commentEdit.Create(m_hWnd,0,WC_EDIT,WS_CHILD | WS_VISIBLE | WS_BORDER | ES_AUTOHSCROLL,0,COMMENT_EDIT);
        commentWriteButton.Create(m_hWnd,0,WC_BUTTON,WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,0,COMMENTWRITE_BOTTON);
        commentPosBox.SetFont(AtlGetDefaultGuiFont());
        commentSizeBox.SetFont(AtlGetDefaultGuiFont());

diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp
index 3388d39..e67ae15 100644 (file)
--- a/nlite/nlite_commentview.cpp
+++ b/nlite/nlite_commentview.cpp
@@ -222,7 +222,7 @@ VOID CCommentView::OnChatReceveSettle(UINT_PTR chatNo,UINT_PTR commentCountSum){
        vScrollInfo.nPage = m_commentListWindow.CalcScrollPage();
        
        
-       this->SetScrollInfo(SB_VERT,&vScrollInfo);
+       this->SetScrollInfo(SB_VERT,&vScrollInfo,FALSE);
 
        
 
@@ -458,7 +458,7 @@ VOID CCommentView::OnVScroll(INT_PTR loWParam,SHORT hiWParam,HWND lParam){
 
        }
 
-       //dy = max(-1 * vScrollInfo.nPos, min(dy, vScrollInfo.nMax - (vScrollInfo.nMax + (INT_PTR)vScrollInfo.nPos)));
+       
 
 
        if(dy != 0){
@@ -710,15 +710,35 @@ VOID CCommentListWindow::DrawItem(CDC &dc,RECT &rc,CChatData &chatData){
        RECT timeViewRect;
        RECT chatViewRect;
        RECT infoViewRect;
+       
 
        time_t chatTime = (time_t)difftime(chatData.date,self.streamStatus.start_time);
-       tm ct = *gmtime(&chatTime);
        
+       
+       BOOL beforeStartFlag = chatTime < 0 ? TRUE : FALSE;
        TCHAR noString[sizeof(chatData.no) * 8]; 
        TCHAR dateString[LENGTH_16];
        _stprintf(noString,TEXT("%u"),chatData.no);
 
-       _tcsftime(dateString,ARRAY_LENGTH(dateString),ct.tm_hour != 0 ? TEXT("%H:%M:%S") : TEXT("%M:%S"),&ct);
+       CNLiteString timeFormat;
+
+
+       if(beforeStartFlag == TRUE){
+
+               timeFormat = TEXT("-");
+               chatTime = -chatTime;
+       }
+       tm ct = *gmtime(&chatTime);
+       if(ct.tm_hour != 0 ){
+
+               timeFormat += TEXT("%H:%M:%S");
+               
+       } else {
+
+               timeFormat += TEXT("%M:%S");
+       }
+
+       _tcsftime(dateString,ARRAY_LENGTH(dateString),timeFormat,&ct);
 
        COLORREF bkColor;
        COLORREF outLineColor;

diff --git a/nlite/nlite_mailframe.h b/nlite/nlite_mailframe.h
index cf679be..111f802 100644 (file)
--- a/nlite/nlite_mailframe.h
+++ b/nlite/nlite_mailframe.h
@@ -40,6 +40,8 @@ namespace nlite{
                        BOOL untilConnectingFlag;
 
                public:
+                       
+
                        CSubLiveNoComboBox(CNliteMainFrame &in_self);
                        
 

diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp
index a009f24..68eec42 100644 (file)
--- a/nlite/nlite_mainframe.cpp
+++ b/nlite/nlite_mainframe.cpp
@@ -20,7 +20,7 @@ CNliteMainFrame::CNliteMainFrame()
 {
        LOGFONT lf = {0};
 
-       lf.lfHeight = 12;
+       lf.lfHeight = 10;
        lf.lfCharSet = SHIFTJIS_CHARSET;
        hTabFont = CreateFontIndirect(&lf);
 }
@@ -79,8 +79,8 @@ LRESULT CNliteMainFrame::OnCreate(LPCREATESTRUCT lpcs){
        commentWriteWindow.Create(m_hWnd,0,NULL,WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN  );
        CreateSimpleReBar();
        HWND hWndToolBar = CreateSimpleToolBarCtrl(m_hWnd,IDC_NLITE, FALSE, ATL_SIMPLE_TOOLBAR_PANE_STYLE);
-       lvNoCombo.Create(m_hWnd, CRect(0, 0, 100, 100), NULL,WS_CHILD | WS_VISIBLE | WS_VSCROLL  | CBS_DROPDOWN , 0, IDC_COMBO_REBAR);
-       lvNoCombo.LimitText(_MAX_PATH);
+       lvNoCombo.Create(m_hWnd, CRect(0, 0, 100, 100), NULL,WS_CHILD | WS_VISIBLE | WS_VSCROLL  | CBS_DROPDOWN | CBS_AUTOHSCROLL, 0, IDC_COMBO_REBAR);
+       lvNoCombo.LimitText(LENGTH_512);
 
        subLiveNoComboBox.SubclassWindow(lvNoCombo.GetEditCtrl());
        lvNoCombo.SetFont(AtlGetDefaultGuiFont());

diff --git a/shareCookie/shareCookie.c b/shareCookie/shareCookie.c
index 09c29eb..eb0a673 100644 (file)
--- a/shareCookie/shareCookie.c
+++ b/shareCookie/shareCookie.c
@@ -312,7 +312,7 @@ static INLINE COOKIE_RESULT GetCookieInternetExplorer(LPWSTR cookie,SIZE_T bufSi
                //\95Û\8cì\83\82\81[\83h\83t\83\89\83O\82ªTRUE\82È\82çIEGetProtectedModeCookie\82Å\83N\83b\83L\81[\82Ì\92l\82ð\8eæ\93¾
                if(isProtectedMode == TRUE){
                        cookieResult = IEGetProtectedModeCookie(url,key,cookie,&bufSize,0);
-                       dumpln(TEXT("IEGetProtectedModeCookie\8eÀ\8ds"));
+                       
 
                //\95Û\8cì\83\82\81[\83h\83t\83\89\83O\82ªFALSE\82È\82çInternetGetCookieEx\82Å\83N\83b\83L\81[\82Ì\92l\82ð\8eæ\93¾
                }else{
@@ -323,10 +323,10 @@ static INLINE COOKIE_RESULT GetCookieInternetExplorer(LPWSTR cookie,SIZE_T bufSi
                                cookieResult = GetLastError();
                        }
                                
-                       dumpln(TEXT("InternetGetCookieEx\8eÀ\8ds"));
+                       
                }
                        
-               dumpln(TEXT("IE:cookies:%s"),cookie);
+               
                        
 
                //\8c\8b\89Ê\83R\81[\83h\94»\92è
@@ -427,7 +427,7 @@ static INLINE COOKIE_RESULT GetCookieFireFox(LPWSTR cookie,SIZE_T bufSize, LPCWS
 
                        cookieStepExec(firefoxCookieStmt,cookie,bufSize, &result);
 
-                       dumpln(TEXT("firefox:cookie:%s"),cookie);
+                       
 
 
                        break;
@@ -555,7 +555,7 @@ static INLINE COOKIE_RESULT GetCookieGoogleChrome(LPWSTR cookie,SIZE_T bufSize,
                                //\83N\83b\83L\81[\8eæ\93¾SQL\8eÀ\8ds
                                cookieStepExec(googleChromeCookieStmt,cookie,bufSize,&result);
 
-                               dumpln(TEXT("googleChrome:cookie:%s"),cookie);
+                               
 
 
                                break;