From: qwerty2501 Date: Tue, 7 Feb 2012 22:08:29 +0000 (+0900) Subject: マイリスト登録ウィンドウ表示機能を断念 X-Git-Tag: v0.002~2^2~17 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=23625a5bc03bd85de24f71a4f0ae20d4537ea372;p=nlite%2Fnlite.git マイリスト登録ウィンドウ表示機能を断念 --- diff --git a/nlite.suo b/nlite.suo index 5c1d3ea..a1cd4f7 100644 Binary files a/nlite.suo and b/nlite.suo differ diff --git a/nlite/nlite.vcxproj b/nlite/nlite.vcxproj index 62936c2..58a1954 100644 --- a/nlite/nlite.vcxproj +++ b/nlite/nlite.vcxproj @@ -111,7 +111,6 @@ - @@ -129,7 +128,6 @@ - diff --git a/nlite/nlite.vcxproj.filters b/nlite/nlite.vcxproj.filters index 512e957..0639688 100644 --- a/nlite/nlite.vcxproj.filters +++ b/nlite/nlite.vcxproj.filters @@ -75,9 +75,6 @@ ヘッダー ファイル - - ヘッダー ファイル - @@ -119,9 +116,6 @@ ソース ファイル - - ソース ファイル - diff --git a/nlite/nlite_addTomylistWindow.cpp b/nlite/nlite_addTomylistWindow.cpp deleted file mode 100644 index 781e9cb..0000000 --- a/nlite/nlite_addTomylistWindow.cpp +++ /dev/null @@ -1,205 +0,0 @@ -#include "stdafx.h" -#include "nlite_include.h" - - -namespace nlite{ - - static const LPCTSTR ADDMYLIST_URL = TEXT("MSHTML:"); - static const LPCTSTR ADDMYLISTAPI_URL = TEXT("http://www.nicovideo.jp/mylist_add/video/{1}"); - /* - VOID WINAPI CAddToMyListWindow::OnDocumentComplete(IDispatch* pDisp, VARIANT* URL){ - - CComPtr idp; - this->m_pWB2->get_Document(&idp); - this->m_pDoc2 = idp; - return; - } - - VOID WINAPI CAddToMyListWindow::OnNewWindow2(LPDISPATCH* ppDisp,BOOL* Cancel ){ - - dumpln(TEXT("newwindow")); - return; - } - - BOOL CAddToMyListWindow::PreTranslateMessage(MSG* pMsg){ - if((pMsg->message < WM_KEYFIRST || pMsg->message > WM_KEYLAST) && - (pMsg->message < WM_MOUSEFIRST || pMsg->message > WM_MOUSELAST)) - return FALSE; - - return (BOOL)SendMessage(WM_FORWARDMSG, 0, (LPARAM)pMsg); - } - - VOID WINAPI CAddToMyListWindow::OnBeforeNavigate2(IDispatch** dispatch, VARIANT* url, VARIANT* flags,VARIANT* frameName, VARIANT* postData, VARIANT* headers, VARIANT_BOOL* cancel){ - - dumpln(TEXT("veforeNavigate")); - - return; - } - - - VOID CAddToMyListWindow::ShowAddWindow(CNicoVideoAuth &refAuth,LPCTSTR lvNo){ - liveNo = ADDMYLIST_URL; - liveNo.Replace(TEXT("{1}"), lvNo); - - if(m_pWB2){ - CComVariant v; - - - // Creates a new one-dimensional array - SAFEARRAY *psaStrings = SafeArrayCreateVector(VT_VARIANT, 0, 1); - if (psaStrings == NULL) { - goto cleanup; - } - - VARIANT *param; - HRESULT hr = SafeArrayAccessData(psaStrings, (LPVOID*)¶m); - param->vt = VT_BSTR; - param->bstrVal = CComBSTR(liveNo); - hr = SafeArrayUnaccessData(psaStrings); - m_pDoc2->write(psaStrings); - -cleanup:; - - //CComPtr iup; - //HRESULT rslt = this->CreateControlEx(liveNo,(IStream*)NULL,(IUnknown**)NULL,&iup,GUID_NULL,(IUnknown*)NULL); - //CComPtr idp = (IDispatch*)&iup; - //iup->QueryInterface(DIID_DWebBrowserEvents2,(LPVOID*)&idp); - - - } - } - - - INT_PTR CAddToMyListWindow::OnCreate(LPCREATESTRUCT lpCreateStruct){ - LRESULT lRet = DefWindowProc(); - - HRESULT hRet = QueryControl(&m_pWB2); - if(SUCCEEDED(hRet)){ - DispEventAdvise(m_pWB2, &DIID_DWebBrowserEvents2); - } - VARIANT v; - //m_pWB2->Navigate(TEXT("url"),&v,&v,&v,&v); - m_pWB2->Navigate(TEXT("about:brank"),&v,&v,&v,&v); - - return lRet; - } - - - VOID CAddToMyListWindow::OnDestroy(){ - - - - if(m_pWB2){ - if(DispEventUnadvise(m_pWB2, &DIID_DWebBrowserEvents2) == S_OK){ - m_pWB2 = NULL; - } - } - - SetMsgHandled(false); - } - */ - - VOID WINAPI CAddToMyListWindow::OnDocumentComplete(IDispatch* pDisp, VARIANT* URL){ - /* - CComPtr idp; - this->m_pWB2->get_Document(&idp); -// this->m_pDoc2 = idp; -*/ - return; - } - - VOID WINAPI CAddToMyListWindow::OnNewWindow2(LPDISPATCH* ppDisp,BOOL* Cancel ){ - - dumpln(TEXT("newwindow")); - return; - } - - BOOL CAddToMyListWindow::PreTranslateMessage(MSG* pMsg){ - if((pMsg->message < WM_KEYFIRST || pMsg->message > WM_KEYLAST) && - (pMsg->message < WM_MOUSEFIRST || pMsg->message > WM_MOUSELAST)) - return FALSE; - - return (BOOL)SendMessage(WM_FORWARDMSG, 0, (LPARAM)pMsg); - } - - VOID WINAPI CAddToMyListWindow::OnBeforeNavigate2(IDispatch** dispatch, VARIANT* url, VARIANT* flags,VARIANT* frameName, VARIANT* postData, VARIANT* headers, VARIANT_BOOL* cancel){ - - - dumpln(TEXT("veforeNavigate")); - - return; - } - - - VOID CAddToMyListWindow::ShowAddWindow(CNicoVideoAuth &refAuth,LPCTSTR lvNo){ - - this->CenterWindow(); - this->ShowWindow(SW_SHOW); - liveNo = ADDMYLISTAPI_URL; - liveNo.Replace(TEXT("{1}"), lvNo); - - if(m_pWB2){ - VARIANT v; - - m_pWB2->Navigate(CComBSTR(liveNo),&v,&v,&v,&v); - - /* - // Creates a new one-dimensional array - SAFEARRAY *psaStrings = SafeArrayCreateVector(VT_VARIANT, 0, 1); - if (psaStrings == NULL) { - goto cleanup; - } - - VARIANT *param; - HRESULT hr = SafeArrayAccessData(psaStrings, (LPVOID*)¶m); - param->vt = VT_BSTR; - param->bstrVal = CComBSTR(liveNo); - hr = SafeArrayUnaccessData(psaStrings); - m_pDoc2->write(psaStrings); - */ -cleanup:; - - //CComPtr iup; - //HRESULT rslt = this->CreateControlEx(liveNo,(IStream*)NULL,(IUnknown**)NULL,&iup,GUID_NULL,(IUnknown*)NULL); - //CComPtr idp = (IDispatch*)&iup; - //iup->QueryInterface(DIID_DWebBrowserEvents2,(LPVOID*)&idp); - - - } - } - - - INT_PTR CAddToMyListWindow::OnCreate(LPCREATESTRUCT lpCreateStruct){ - LRESULT lRet = DefWindowProc(); - - HRESULT hRet = QueryControl(&m_pWB2); - if(SUCCEEDED(hRet)){ - DispEventAdvise(m_pWB2, &DIID_DWebBrowserEvents2); - } - /* - VARIANT v; - //m_pWB2->Navigate(TEXT("url"),&v,&v,&v,&v); - m_pWB2->Navigate(TEXT("about:brank"),&v,&v,&v,&v); - */ - return lRet; - } - - - VOID CAddToMyListWindow::OnDestroy(){ - - - - if(m_pWB2){ - if(DispEventUnadvise(m_pWB2, &DIID_DWebBrowserEvents2) == S_OK){ - m_pWB2 = NULL; - } - } - - SetMsgHandled(false); - } - - VOID CAddToMyListWindow::OnClose(){ - - this->ShowWindow(SW_HIDE); - } -} diff --git a/nlite/nlite_addTomylistWindow.h b/nlite/nlite_addTomylistWindow.h deleted file mode 100644 index 68d73a1..0000000 --- a/nlite/nlite_addTomylistWindow.h +++ /dev/null @@ -1,152 +0,0 @@ -#pragma once - -#define IDC_NLITE_ADDMYLIST 1001 - -namespace nlite{ - - //class CAddToMyListDialog; - - /* - class CAddToMyListWindow : public CWindowImpl, - public IDispEventImpl - { - //friend CAddToMyListDialog; - public: - DECLARE_WND_SUPERCLASS(NULL, CAxWindow::GetWndClassName()) - - CComPtr m_pWB2; - CComPtr m_pDoc2; - - CString liveNo; - - BOOL PreTranslateMessage(MSG* pMsg); - - - BEGIN_MSG_MAP(CAddToMyListWindow) - MSG_WM_CREATE(OnCreate) - MSG_WM_DESTROY(OnDestroy) - END_MSG_MAP() - - BEGIN_SINK_MAP(CAddToMyListWindow) - SINK_ENTRY_EX(IDC_NLITE_ADDMYLIST, DIID_DWebBrowserEvents2, DISPID_DOCUMENTCOMPLETE, OnDocumentComplete) - SINK_ENTRY_EX(IDC_NLITE_ADDMYLIST, DIID_DWebBrowserEvents2, DISPID_NEWWINDOW2, OnNewWindow2) - SINK_ENTRY_EX(IDC_NLITE_ADDMYLIST, - DIID_DWebBrowserEvents2, DISPID_BEFORENAVIGATE2, OnBeforeNavigate2) - END_SINK_MAP() - - - public: - - /// - ///ƒhƒLƒ…ƒƒ“ƒg“ǂݍž‚݉”\‚É‚È‚Á‚½‚Æ‚« - /// - VOID WINAPI OnDocumentComplete(IDispatch* pDisp, VARIANT* URL); - - /// - ///V‚µ‚¢ƒEƒBƒ“ƒhƒEì¬Žž‚̏ˆ— - /// - VOID WINAPI OnNewWindow2(LPDISPATCH* ppDisp,BOOL* Cancel ); - - /// - ///ƒiƒrƒQ[ƒVƒ‡ƒ“‘O - /// - VOID WINAPI OnBeforeNavigate2(IDispatch** dispatch, VARIANT* url, VARIANT* flags,VARIANT* frameName, VARIANT* postData, VARIANT* headers, VARIANT_BOOL* cancel); - - /// - ///ƒ}ƒCƒŠƒXƒg“o˜^‰æ–Ê•\Ž¦ - /// - VOID ShowAddWindow(CNicoVideoAuth &refAuth,LPCTSTR lvNo); - private: - - /// - ///ì¬Žž‚̏ˆ— - /// - INT_PTR OnCreate(LPCREATESTRUCT lpCreateStruct); - - /// - ///”jŠüŽž‚̏ˆ— - /// - VOID OnDestroy(); - - - - - - - }; - */ - - - class CAddToMyListWindow : public CWindowImpl, - public IDispEventImpl - { - //friend CAddToMyListDialog; - public: - DECLARE_WND_SUPERCLASS(NULL, CAxWindow::GetWndClassName()) - - CComPtr m_pWB2; -// CComPtr m_pDoc2; - - CString liveNo; - - BOOL PreTranslateMessage(MSG* pMsg); - - - BEGIN_MSG_MAP(CAddToMyListWindow) - MSG_WM_CREATE(OnCreate) - MSG_WM_CLOSE(OnClose) - MSG_WM_DESTROY(OnDestroy) - END_MSG_MAP() - - BEGIN_SINK_MAP(CAddToMyListWindow) - SINK_ENTRY_EX(IDC_NLITE_ADDMYLIST, DIID_DWebBrowserEvents2, DISPID_DOCUMENTCOMPLETE, OnDocumentComplete) - SINK_ENTRY_EX(IDC_NLITE_ADDMYLIST, DIID_DWebBrowserEvents2, DISPID_NEWWINDOW2, OnNewWindow2) - SINK_ENTRY_EX(IDC_NLITE_ADDMYLIST, - DIID_DWebBrowserEvents2, DISPID_BEFORENAVIGATE2, OnBeforeNavigate2) - END_SINK_MAP() - - - public: - - /// - ///ƒhƒLƒ…ƒƒ“ƒg“ǂݍž‚݉”\‚É‚È‚Á‚½‚Æ‚« - /// - VOID WINAPI OnDocumentComplete(IDispatch* pDisp, VARIANT* URL); - - /// - ///V‚µ‚¢ƒEƒBƒ“ƒhƒEì¬Žž‚̏ˆ— - /// - VOID WINAPI OnNewWindow2(LPDISPATCH* ppDisp,BOOL* Cancel ); - - /// - ///ƒiƒrƒQ[ƒVƒ‡ƒ“‘O - /// - VOID WINAPI OnBeforeNavigate2(IDispatch** dispatch, VARIANT* url, VARIANT* flags,VARIANT* frameName, VARIANT* postData, VARIANT* headers, VARIANT_BOOL* cancel); - - /// - ///ƒ}ƒCƒŠƒXƒg“o˜^‰æ–Ê•\Ž¦ - /// - VOID ShowAddWindow(CNicoVideoAuth &refAuth,LPCTSTR lvNo); - private: - - /// - ///ì¬Žž‚̏ˆ— - /// - INT_PTR OnCreate(LPCREATESTRUCT lpCreateStruct); - - /// - ///”jŠüŽž‚̏ˆ— - /// - VOID OnDestroy(); - - /// - ///•Â‚¶‚ç‚ê‚é‚Æ‚«‚̏ˆ— - /// - VOID OnClose(); - - - - - }; - -} \ No newline at end of file diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp index 5bd0c11..ce80038 100644 --- a/nlite/nlite_commentview.cpp +++ b/nlite/nlite_commentview.cpp @@ -5,6 +5,7 @@ using namespace std::tr1; namespace nlite{ static const LPCTSTR LIVEURL_PART = TEXT("http://live.nicovideo.jp/watch/"); + static const LPCTSTR ADDMYLIST_PART = TEXT("http://www.nicovideo.jp/mylist_add/video/"); static const UINT_PTR SELL_SPACE_LENGTH = 1; // @@ -1306,7 +1307,7 @@ end: //iu->QueryInterface(DIID_DWebBrowserEvents2,&addToMyListWindow); RECT rc = {0,0,300,200}; - addToMyListWindow.Create(m_hWnd, &rc,_T("Shell.Explorer.2"),WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN , 0); +// addToMyListWindow.Create(m_hWnd, &rc,_T("Shell.Explorer.2"),WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN , 0); return 0; } @@ -1388,7 +1389,7 @@ end: VOID CCommentListWindow::OnDestroy(){ - this->addToMyListWindow.DestroyWindow(); +// this->addToMyListWindow.DestroyWindow(); } @@ -1562,25 +1563,20 @@ end: chatReadEdit.GetSelText(selTextBuf); if(regex_match((LPCTSTR)selTextBuf,nliteregex::URL) == TRUE){ - OpenURL(*this,self.generalProperty,selTextBuf,SW_SHOWNORMAL); + } else if(regex_match((LPCTSTR)selTextBuf,nliteregex::VIDEOID) == TRUE){ - - - - addToMyListWindow.ShowAddWindow(self.refAuth,selTextBuf); - ::SetFocus(lParam->hwndFrom); + selTextBuf.Insert(0,ADDMYLIST_PART); - } else if( regex_match((LPCTSTR)selTextBuf,nliteregex::LIVEID) == TRUE){ selTextBuf.Insert(0,LIVEURL_PART); - OpenURL(*this,self.generalProperty,selTextBuf,SW_SHOWNORMAL); - + } + OpenURL(*this,self.generalProperty,selTextBuf,SW_SHOWNORMAL); } } break; diff --git a/nlite/nlite_commentview.h b/nlite/nlite_commentview.h index 543b957..48720a8 100644 --- a/nlite/nlite_commentview.h +++ b/nlite/nlite_commentview.h @@ -158,7 +158,7 @@ namespace nlite{ CPen selectSellLinePen; //˜gü•`‰æ—pƒyƒ“ CBrush selectBkBrush; //”wŒi•`‰æ—pƒuƒ‰ƒV CFont linkFont; - CAddToMyListWindow addToMyListWindow; //ƒ}ƒCƒŠƒXƒg“o˜^—pƒEƒBƒ“ƒhƒE +// CAddToMyListWindow addToMyListWindow; //ƒ}ƒCƒŠƒXƒg“o˜^—pƒEƒBƒ“ƒhƒE //ƒŠƒ“ƒN•¶Žš—ñ—p‚̃tƒHƒ“ƒg enum { diff --git a/nlite/nlite_include.h b/nlite/nlite_include.h index 37e16be..4cc340d 100644 --- a/nlite/nlite_include.h +++ b/nlite/nlite_include.h @@ -15,7 +15,6 @@ #include "nlite_commentWrite.h" #include "nlite_nlib.h" #include "nlite_property.h" -#include "nlite_addTomylistWindow.h" #include "nlite_chatData.h" #include "nlite_commentview.h" #include "nlite_appinfo.h"